Merge branch '2024-03-13' into 'master_dev'

fix：组织编辑bug

See merge request yunteng/thingskit!367

@@ -196,12 +196,16 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     } else {
       organization.setParentId(null);
     }
-    baseMapper.updateById(organization);
-    organization.copyToDTO(organizationDTO);
-    //父级组织有变化才更新
-    if(!organizationDTO.getParentId().equals(sourceParentOrganizationId)){
-      invalidateParentAndMeCacheByTenantIdAndId(tenantId,false,organizationDTO.getParentId(),organization.getId());
+
+    String parentId = organizationDTO.getParentId();
+    // 只要变更上级id都向上清除原上级以及目标上级缓存
+    if((StringUtils.isEmpty(parentId)&&StringUtils.isNotEmpty(sourceParentOrganizationId))||//顶级变次级 原为null
+            (StringUtils.isEmpty(sourceParentOrganizationId)&&StringUtils.isNotEmpty(parentId))||//次级便顶级 目标为null
+    (StringUtils.isNotEmpty(parentId)&&!parentId.equals(sourceParentOrganizationId))){//正常变化
+      invalidateParentAndMeCacheByTenantIdAndId(tenantId,false,sourceParentOrganizationId,parentId);
     }
+
+    baseMapper.updateById(organization);
     return organizationDTO;
   }
 
@@ -389,14 +393,17 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
   public void invalidateParentAndMeCacheByTenantIdAndId(String tenantId, boolean isAdd, String sourceParentOrganizationId,
          String targetOrganizationId) {
     if(!isAdd && StringUtils.isNotEmpty(sourceParentOrganizationId)){
-      //原组织缓存
+        //原组织缓存
       List<OrganizationDTO> sourceParentOrganizationIds =
               findOrganizationTreeList(tenantId,OrganizationEnum.UP,List.of(sourceParentOrganizationId));
       sourceParentOrganizationIds.forEach(org->cacheUtils.invalidate(cacheName,tenantId + "_" + org.getId()));
     }
-    //目标组织缓存
-    List<OrganizationDTO> targetOrganizationIds =
-            findOrganizationTreeList(tenantId,OrganizationEnum.UP,List.of(targetOrganizationId));
-    targetOrganizationIds.forEach(org->cacheUtils.invalidate(cacheName,tenantId + "_" + org.getId()));
+    if(!isAdd && StringUtils.isNotEmpty(targetOrganizationId)){
+      //目标组织缓存
+      List<OrganizationDTO> targetOrganizationIds =
+              findOrganizationTreeList(tenantId,OrganizationEnum.UP,List.of(targetOrganizationId));
+      targetOrganizationIds.forEach(org->cacheUtils.invalidate(cacheName,tenantId + "_" + org.getId()));
+    }
+
   }
 }