fix 注册认证

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserTenant.java

@@ -19,6 +19,7 @@ public class SysUserTenant{
      */
     @TableId(type = IdType.INPUT)
     private Long userId;
+
     private String tenantId;
 
 

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/ResidentInfoServiceImpl.java

@@ -233,7 +233,11 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
             SysUserTenant sysUserTenant = new SysUserTenant();
             sysUserTenant.setUserId(userId);
             sysUserTenant.setTenantId(tenantId);
-            sysUserTenantMapper.insert(sysUserTenant);
+            SysUserTenant sysUserTenantOld = sysUserTenantMapper.selectOne(new LambdaQueryWrapper<SysUserTenant>().eq(SysUserTenant::getUserId, userId)
+                .eq(SysUserTenant::getTenantId, tenantId));
+            if (sysUserTenantOld == null) {
+                sysUserTenantMapper.insert(sysUserTenant);
+            }
             //给该userId赋予角色
             // 新增用户与角色管理
             //根据权限字符去查询角色id
@@ -363,7 +367,11 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
         SysUserTenant sysUserTenant = new SysUserTenant();
         sysUserTenant.setUserId(userId);
         sysUserTenant.setTenantId(tenantId);
-        sysUserTenantMapper.insertOrUpdate(sysUserTenant);
+        SysUserTenant sysUserTenantOld = sysUserTenantMapper.selectOne(new LambdaQueryWrapper<SysUserTenant>().eq(SysUserTenant::getUserId, userId)
+            .eq(SysUserTenant::getTenantId, tenantId));
+        if (sysUserTenantOld == null) {
+            sysUserTenantMapper.insert(sysUserTenant);
+        }
         //给该userId赋予角色
         // 新增用户与角色管理
         //根据权限字符去查询角色id
@@ -520,7 +528,12 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                 SysUserTenant sysUserTenant = new SysUserTenant();
                 sysUserTenant.setUserId(residentInfo.getUserId());
                 sysUserTenant.setTenantId(tenantId);
-                sysUserTenantMapper.insertOrUpdate(sysUserTenant);
+                SysUserTenant sysUserTenantOld = sysUserTenantMapper.selectOne(new LambdaQueryWrapper<SysUserTenant>().eq(SysUserTenant::getUserId, userId)
+                    .eq(SysUserTenant::getTenantId, tenantId));
+                if (sysUserTenantOld == null) {
+                    sysUserTenantMapper.insert(sysUserTenant);
+                }
+
             }
             //给该userId赋予角色
             // 新增用户与角色管理

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/StaffManageServiceImpl.java

@@ -271,7 +271,11 @@ public class StaffManageServiceImpl implements IStaffManageService {
             SysUserTenant sysUserTenant = new SysUserTenant();
             sysUserTenant.setUserId(userId);
             sysUserTenant.setTenantId(staffManage.getTenantId());
-            sysUserTenantMapper.insert(sysUserTenant);
+            SysUserTenant sysUserTenantOld = sysUserTenantMapper.selectOne(new LambdaQueryWrapper<SysUserTenant>().eq(SysUserTenant::getUserId, userId)
+                .eq(SysUserTenant::getTenantId, staffManage.getTenantId()));
+            if (sysUserTenantOld == null) {
+                sysUserTenantMapper.insert(sysUserTenant);
+            }
 
             //给该userId赋予角色
             // 新增用户与角色管理
@@ -419,7 +423,12 @@ public class StaffManageServiceImpl implements IStaffManageService {
                 SysUserTenant sysUserTenant = new SysUserTenant();
                 sysUserTenant.setUserId(examineStaffManage.getUserId());
                 sysUserTenant.setTenantId(examineStaffManage.getTenantId());
-                sysUserTenantMapper.insert(sysUserTenant);
+                SysUserTenant sysUserTenantOld = sysUserTenantMapper.selectOne(new LambdaQueryWrapper<SysUserTenant>().eq(SysUserTenant::getUserId, examineStaffManage.getUserId())
+                    .eq(SysUserTenant::getTenantId, examineStaffManage.getTenantId()));
+                if (sysUserTenantOld == null) {
+                    sysUserTenantMapper.insert(sysUserTenant);
+                }
+
             }
             //组装sysUser
             //给该userId赋予角色

ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/ResidentInfoMapper.xml

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectResidentInfoVo">
         select  s.resident_id,s.tenant_id,s.user_id,s.detailed_address,s.resident_name,s.resident_id_card
              ,s.resident_birthday,s.resident_phone,s.resident_gender,s.resident_relationship,s.is_householder,s.is_tenant,s.resident_employer,s.special_type,
-             s.resident_hobby,s.resident_appearance,s.id_card_front,s.id_card_back,s.id_card_address,s.face_photo,s.create_time
+             s.resident_hobby,s.resident_appearance,s.id_card_front,s.id_card_back,s.id_card_address,s.face_photo,s.examine,s.create_time
         from resident_info s
     </sql>