fix: [DEFECT-1521] 删除租户时,同时删除用户与角色的关系映射

@@ -766,6 +766,32 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     }
     }
   }
   }
 
 
+  @Override
+  @Transactional
+  public boolean deleteUserAndRoleMapping(List<String> userIds,String tenantId) {
+    if(StringUtils.isEmpty(tenantId) || null == userIds || userIds.isEmpty()){
+      return false;
+    }
+    boolean result;
+    result = baseMapper.delete(new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getTenantId,tenantId).in(
+            SysUserEntity::getId,userIds))> MagicNumber.ZERO;
+    if(result){
+      result = userRoleMapper.delete(new LambdaQueryWrapper<SysUserRoleEntity>().in(SysUserRoleEntity::getUserId,
+              userIds))>MagicNumber.ZERO;
+    }
+    return result;
+  }
+
+  @Override
+  public List<String> findUserIdsByTenantId(String tenantId) {
+    List<SysUserEntity> entities = baseMapper.selectList(new LambdaQueryWrapper<SysUserEntity>().
+            eq(SysUserEntity::getTenantId,tenantId));
+    if(null == entities || entities.isEmpty()){
+      return null;
+    }
+    return entities.stream().map(entity->entity.getId()).collect(Collectors.toList());
+  }
+
   private void checkPassword(AccountReqDTO accountReqDTO, SysUserEntity user) {
   private void checkPassword(AccountReqDTO accountReqDTO, SysUserEntity user) {
     if (null == user
     if (null == user
         || StringUtils.isEmpty(accountReqDTO.getPassword())
         || StringUtils.isEmpty(accountReqDTO.getPassword())

@@ -142,8 +142,10 @@ public class TkTenantServiceImpl extends AbstractBaseService<TenantMapper, SysTe
             menuMapper.deleteTenantMenuMappingByMenuIds(allMenuIds);
             menuMapper.deleteTenantMenuMappingByMenuIds(allMenuIds);
           }
           }
           // 4. DELETE USER
           // 4. DELETE USER
-          userMapper.delete(
-              new QueryWrapper<SysUserEntity>().lambda().in(SysUserEntity::getTenantId, tenantIds));
+          for (String tenantId:tenantIds){
+            //查询该租户下有多少用户
+            tkUserService.deleteUserAndRoleMapping(tkUserService.findUserIdsByTenantId(tenantId),tenantId);
+          }
           // 5. TELL RULE ENGINE TO STOP TENANT
           // 5. TELL RULE ENGINE TO STOP TENANT
           // 6. DELETE OTHER RESOURCES IF ANY
           // 6. DELETE OTHER RESOURCES IF ANY
           // 7. DELETE ORGANIZATION
           // 7. DELETE ORGANIZATION
@@ -184,6 +186,8 @@ public class TkTenantServiceImpl extends AbstractBaseService<TenantMapper, SysTe
           baseMapper.deleteBatchIds(ids);
           baseMapper.deleteBatchIds(ids);
           // 17. DELETE DEVICE_PROFILE
           // 17. DELETE DEVICE_PROFILE
           tkDeviceProfileService.deleteDataByTenantIds(tenantIds);
           tkDeviceProfileService.deleteDataByTenantIds(tenantIds);
+          // 18. 删除用户与角色的映射表
+
           return Futures.immediateFuture(true);
           return Futures.immediateFuture(true);
         },
         },
         MoreExecutors.directExecutor());
         MoreExecutors.directExecutor());

@@ -166,4 +166,18 @@ public interface TkUserService {
    */
    */
   void updateTenantAdminUserCredentials(
   void updateTenantAdminUserCredentials(
       List<UserId> ids, String currentTenantId, boolean userCredentialsEnabled,boolean needUpdateStatus);
       List<UserId> ids, String currentTenantId, boolean userCredentialsEnabled,boolean needUpdateStatus);
+
+  /**
+   * 通过租户ID删除用户和用户的角色关系表
+   * @param userIds 用户IDS
+   * @param tenantId 租户ID
+   */
+  boolean deleteUserAndRoleMapping(List<String> userIds,String tenantId);
+
+  /**
+   * 根据租户ID，查找所有的用户ID
+   * @param tenantId 租户ID
+   * @return 用户ID列表
+   */
+  List<String> findUserIdsByTenantId(String tenantId);
 }
 }