Merge remote-tracking branch 'origin/master'

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

@@ -547,6 +547,11 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        //居住人员待认证数量-1
+        if (RedisUtils.hasKey(RESIDENT_INFO_AUTHENTICATION)) {
+            Object count = RedisUtils.getCacheObject(RESIDENT_INFO_AUTHENTICATION);
+            RedisUtils.setCacheObject(RESIDENT_INFO_AUTHENTICATION, Math.max(Integer.parseInt(count.toString()), 0));
+        }
         return baseMapper.deleteByIds(ids) > 0;
     }
 
@@ -688,7 +693,7 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
             });
             // 删除用户与租户关联
             TenantHelper.ignore(() -> {
-                sysUserTenantMapper.delete(new LambdaQueryWrapper<SysUserTenant>().eq(SysUserTenant::getUserId, userId).eq(SysUserTenant::getTenantId, tenantId));
+                sysUserTenantMapper.updateByTenantId(tenantId,userId,ONE);
             });
 /*            if (residentInfoList != null && !residentInfoList.isEmpty()) {
                 //判断用户的默认租户是否是被删除的那个租户，是的情况下换一个租户id给sysUser表中

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

@@ -396,6 +396,11 @@ public class StaffManageServiceImpl implements IStaffManageService {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        //员工待认证数量-1
+        if (RedisUtils.hasKey(STAFF_MANAGE_AUTHENTICATION)){
+            Object count = RedisUtils.getCacheObject(STAFF_MANAGE_AUTHENTICATION);
+            RedisUtils.setCacheObject(STAFF_MANAGE_AUTHENTICATION,Math.max(Integer.parseInt(count.toString()),0));
+        }
         return baseMapper.deleteByIds(ids) > 0;
     }
 
@@ -517,7 +522,7 @@ public class StaffManageServiceImpl implements IStaffManageService {
             });
             // 删除用户与租户关联
             TenantHelper.ignore(() -> {
-                sysUserTenantMapper.delete(new LambdaQueryWrapper<SysUserTenant>().eq(SysUserTenant::getUserId, userId).eq(SysUserTenant::getTenantId, tenantId));
+                sysUserTenantMapper.updateByTenantId(tenantId,userId,ONE);
             });
 /*            if (staffManageList != null && !staffManageList.isEmpty()) {
                 //判断用户的默认租户是否是被删除的那个租户，是的情况下换一个租户id给sysUser表中