fix 常用人员

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java

@@ -81,6 +81,7 @@ public interface Constants {
      * 默认租户id
      */
     String TENANT_ID = "000000";
+    String ZERO = "0";
     String ONE = "1";
     String TWO = "2";
     String THR = "3";

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserTenantMapper.java

@@ -18,4 +18,6 @@ public interface SysUserTenantMapper extends BaseMapperPlus<SysUserTenant, SysUs
 
     @InterceptorIgnore(tenantLine = "true", dataPermission = "false")
     void updateByTenantId(@Param("tenantId")String tenantId,@Param("userId")Long userId,@Param("delFlag")String delFlag);
+
+    SysUserTenant selectSysUserTenantOne(@Param("tenantId")String tenantId,@Param("userId")Long userId);
 }

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserTenantMapper.xml

@@ -8,6 +8,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByUserId" resultType="java.lang.Integer" parameterType="java.lang.Long">
         select count(1) from sys_user_tenant where user_id = #{userId} and del_flag = '0';
     </select>
+    <select id="selectSysUserTenantOne" resultType="org.dromara.system.domain.SysUserTenant">
+        select *  from sys_user_tenant  where user_id = #{userId} and tenant_id = #{tenantId}
+    </select>
 
     <update id="updateByTenantId">
         update sys_user_tenant set del_flag = #{delFlag} where user_id = #{userId} and tenant_id = #{tenantId}

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

@@ -615,12 +615,12 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                 SysUserTenant sysUserTenant = new SysUserTenant();
                 sysUserTenant.setUserId(residentInfo.getUserId());
                 sysUserTenant.setTenantId(tenantId);
-                SysUserTenant sysUserTenantOld = sysUserTenantMapper.selectOne(new LambdaQueryWrapper<SysUserTenant>().eq(SysUserTenant::getUserId, userId)
-                    .eq(SysUserTenant::getTenantId, tenantId));
+                SysUserTenant sysUserTenantOld = sysUserTenantMapper.selectSysUserTenantOne(tenantId, sysUserTenant.getUserId());
                 if (sysUserTenantOld == null) {
                     sysUserTenantMapper.insert(sysUserTenant);
+                }else {
+                    sysUserTenantMapper.updateByTenantId(tenantId, sysUserTenant.getUserId(),ZERO);
                 }
-
             }
             //给该userId赋予角色
             // 新增用户与角色管理

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

@@ -176,10 +176,10 @@ public class StaffManageServiceImpl implements IStaffManageService {
             TenantHelper.ignore(() -> {
                 //待认证的员工人员数量，统计使用
                 if (RedisUtils.hasKey(tenantId + ":" + STAFF_MANAGE_AUTHENTICATION)) {
-                    Object count = RedisUtils.getCacheObject(tenantId + ":" +STAFF_MANAGE_AUTHENTICATION);
-                    RedisUtils.setCacheObject(tenantId + ":" +STAFF_MANAGE_AUTHENTICATION, Integer.parseInt(count.toString()) + 1);
+                    Object count = RedisUtils.getCacheObject(tenantId + ":" + STAFF_MANAGE_AUTHENTICATION);
+                    RedisUtils.setCacheObject(tenantId + ":" + STAFF_MANAGE_AUTHENTICATION, Integer.parseInt(count.toString()) + 1);
                 } else {
-                    RedisUtils.setCacheObject(tenantId + ":" +STAFF_MANAGE_AUTHENTICATION, 1);
+                    RedisUtils.setCacheObject(tenantId + ":" + STAFF_MANAGE_AUTHENTICATION, 1);
                 }
             });
 /*
@@ -330,10 +330,10 @@ public class StaffManageServiceImpl implements IStaffManageService {
             TenantHelper.ignore(() -> {
                 //待认证的员工人员数量，统计使用
                 if (RedisUtils.hasKey(tenantId + ":" + STAFF_MANAGE_AUTHENTICATION)) {
-                    Object count = RedisUtils.getCacheObject(tenantId + ":" +STAFF_MANAGE_AUTHENTICATION);
-                    RedisUtils.setCacheObject(tenantId + ":" +STAFF_MANAGE_AUTHENTICATION, Integer.parseInt(count.toString()) + 1);
+                    Object count = RedisUtils.getCacheObject(tenantId + ":" + STAFF_MANAGE_AUTHENTICATION);
+                    RedisUtils.setCacheObject(tenantId + ":" + STAFF_MANAGE_AUTHENTICATION, Integer.parseInt(count.toString()) + 1);
                 } else {
-                    RedisUtils.setCacheObject(tenantId + ":" +STAFF_MANAGE_AUTHENTICATION, 1);
+                    RedisUtils.setCacheObject(tenantId + ":" + STAFF_MANAGE_AUTHENTICATION, 1);
                 }
             });
         }
@@ -464,12 +464,12 @@ public class StaffManageServiceImpl implements IStaffManageService {
                 SysUserTenant sysUserTenant = new SysUserTenant();
                 sysUserTenant.setUserId(examineStaffManage.getUserId());
                 sysUserTenant.setTenantId(examineStaffManage.getTenantId());
-                SysUserTenant sysUserTenantOld = sysUserTenantMapper.selectOne(new LambdaQueryWrapper<SysUserTenant>().eq(SysUserTenant::getUserId, examineStaffManage.getUserId())
-                    .eq(SysUserTenant::getTenantId, examineStaffManage.getTenantId()));
+                SysUserTenant sysUserTenantOld = sysUserTenantMapper.selectSysUserTenantOne(examineStaffManage.getTenantId(), sysUserTenant.getUserId());
                 if (sysUserTenantOld == null) {
                     sysUserTenantMapper.insert(sysUserTenant);
+                }else {
+                    sysUserTenantMapper.updateByTenantId(examineStaffManage.getTenantId(), sysUserTenant.getUserId(),ZERO);
                 }
-
             }
             //组装sysUser
             //给该userId赋予角色