fix: 租户管理员进行组织调整时,对应组织的源用户和目标用户映射关系表进行更新

@@ -20,7 +20,6 @@ import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
-import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -47,9 +46,10 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
       boolean isCustomerOrPlatform,
       String userId) {
     Assert.notNull(organizationDTO.getName(), "organization name cannot be null");
-    if (StringUtils.isNotBlank(organizationDTO.getParentId())) {
+    String parentId = organizationDTO.getParentId();
+    if (StringUtils.isNotBlank(parentId)) {
       // 新增有父组织,拿到父组织
-      TkOrganizationEntity organization = baseMapper.selectById(organizationDTO.getParentId());
+      TkOrganizationEntity organization = baseMapper.selectById(parentId);
       if (organization == null) {
         // 父组织不存在
         throw new TkDataValidationException("parent organization not exist!");
@@ -64,13 +64,12 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     organizationDTO.copyToEntity(organization, "id");
     // 如果当前账号为平台管理员或者用户
     if (isCustomerOrPlatform) {
-      if (StringUtils.isEmpty(organizationDTO.getParentId())) {
+      if (StringUtils.isEmpty(parentId)) {
         // 获取当前用户的最顶级组织ID的父ID
         List<OrganizationDTO> myOrganizations = getMyOrganizations(false, false, false,false,tenantId, userId,null);
         if (null != myOrganizations && myOrganizations.size() > 0) {
           OrganizationDTO organizationDto = myOrganizations.get(0);
-          String parentId = organizationDto.getParentId();
-          organization.setParentId(parentId);
+          organization.setParentId(organizationDto.getParentId());
         }
       }
     }
@@ -94,6 +93,8 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
     organization.copyToDTO(organizationDTO);
     invalidateParentAndMeCacheByTenantIdAndId(tenantId,true,null,organization.getId());
+    //查询目标组织的用户列表,新增当前组织关联的目标用户映射
+    addUserOrganizationMapping(parentId,organization.getId());
     return organizationDTO;
   }
 
@@ -162,13 +163,14 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
       boolean isCustomerOrPlatform,
       String userId) {
     Assert.notNull(organizationDTO.getName(), "organization name cannot be null");
+    String organizationId = organizationDTO.getId();
     // 判断自己父id不能为本身的id
     if (organizationDTO.getParentId() != null
-        && organizationDTO.getParentId().equals(organizationDTO.getId())) {
+        && organizationDTO.getParentId().equals(organizationId)) {
       throw new TkDataValidationException(ErrorMessage.IT_CANT_EQUAL_ITSELF.name());
     }
     // 选择的组织
-    TkOrganizationEntity organization = baseMapper.selectById(organizationDTO.getId());
+    TkOrganizationEntity organization = baseMapper.selectById(organizationId);
     TkOrganizationEntity parent = null;
     // 父级组织不为空,则查询到父级组织
     if (StringUtils.isNotBlank(organizationDTO.getParentId())) {
@@ -205,63 +207,31 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     (StringUtils.isNotEmpty(parentId)&&!parentId.equals(sourceParentOrganizationId))){//正常变化
       invalidateParentAndMeCacheByTenantIdAndId(tenantId,false,sourceParentOrganizationId,parentId);
     }
-    //获取组织修改之前原上级与目标上级所绑定的用户
-    List<Map<String,String>> userOrgList =  getUserOrgMap(getUserByOrganizationIds(parentId),getUserByOrganizationIds(sourceParentOrganizationId));
-    baseMapper.updateById(organization);
-    //组织修改过后更新原上级与目标上级用户绑定的组织
-    if(null!=userOrgList){
-      for (Map<String,String> userOrg:userOrgList){
-        String user = userOrg.get("userId");
-        String org =  userOrg.get("orgId");
-        List<String>orgIds = organizationAllIds(tenantId, org);
-        addOrUpdateUserOrganizationMapping(user,orgIds);
-      }
+
+    //如果源上级组织与目标组织有变更,则需要更新用户组织映射表信息
+    if(!Objects.equals(sourceParentOrganizationId,parentId)){
+      //删除当前组织关联的源用户映射
+      deleteUserOrganizationMappingByOrganizationId(organizationId);
+      //查询目标组织的用户列表,新增当前组织关联的目标用户映射
+      addUserOrganizationMapping(parentId,organizationId);
     }
+    baseMapper.updateById(organization);
     return organizationDTO;
   }
 
-  public void addOrUpdateUserOrganizationMapping(
-          String userId, List<String> organizationIds) {
-    if (StringUtils.isEmpty(userId) || null == organizationIds || organizationIds.size() < 1) {
-      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-    }
-    // 先删除,再新增
-    userOrganizationMappingMapper.delete(
-            new LambdaQueryWrapper<TkUserOrganizationMappingEntity>()
-                    .eq(TkUserOrganizationMappingEntity::getUserId, userId));
-    organizationIds.forEach(
-            organizationId -> {
-              TkUserOrganizationMappingEntity userOrganizationMapping = new TkUserOrganizationMappingEntity();
-              userOrganizationMapping.setUserId(userId);
-              userOrganizationMapping.setOrganizationId(organizationId);
-              userOrganizationMappingMapper.insert(userOrganizationMapping);
-            });
+  private void deleteUserOrganizationMappingByOrganizationId(String organizationId){
+    userOrganizationMappingMapper.delete(new LambdaQueryWrapper<TkUserOrganizationMappingEntity>()
+            .eq(TkUserOrganizationMappingEntity::getOrganizationId,organizationId));
   }
 
-  List<Map<String,String>> getUserOrgMap(List<String>newUserIds ,List<String> oldUserIds){
-    //目标上级原本绑定的用户 newUserIds
-    //原上级原本绑定的用户 oldUserIds
-    List<Map<String,String>> userOrgList = new ArrayList<>();
-    if(null!=newUserIds){
-      for (String newUserId:newUserIds) {
-        Map<String,String> map  = new HashMap<>();
-        map.put("userId",newUserId);
-        map.put("orgId",  getOrganizationIdsByUser(newUserId).get(0));
-        userOrgList.add(map);
-      }
-    }
-    if(null!=oldUserIds){
-      for (String oldUserId:oldUserIds) {
-        Map<String,String> map  = new HashMap<>();
-        map.put("userId",oldUserId);
-        map.put("orgId",  getOrganizationIdsByUser(oldUserId).get(0));
-        userOrgList.add(map);
-      }
+  private void addUserOrganizationMapping(String targetParentId,String organizationId){
+    List<String> userIds = getUsersByOrganizationId(targetParentId);
+    if(null != userIds && !userIds.isEmpty()){
+      userIds.forEach(id->userOrganizationMappingMapper.insert(new TkUserOrganizationMappingEntity(id,organizationId)));
     }
-    return userOrgList;
   }
   // 获取当前组织的用户id集
-  List<String> getUserByOrganizationIds(String ogrId){
+  List<String> getUsersByOrganizationId(String ogrId){
     if (StringUtils.isEmpty(ogrId)) {
       return  null;
     }