Merge branch 'localhost-cxy' into 'master'

fix: 组织修改实现

See merge request huang/thingsboard3.3.2!21

 package org.thingsboard.server.dao.yunteng.entities;
 package org.thingsboard.server.dao.yunteng.entities;
 
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
@@ -9,6 +11,8 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(ModelConstants.Table.IOTFS_ORGANIZATION_TABLE_NAME)
 @TableName(ModelConstants.Table.IOTFS_ORGANIZATION_TABLE_NAME)
 public class Organization extends TenantBaseEntity {
 public class Organization extends TenantBaseEntity {
+
+  @TableField(updateStrategy = FieldStrategy.IGNORED)
   private String parentId;
   private String parentId;
   private String name;
   private String name;
   private int sort;
   private int sort;

@@ -107,8 +107,10 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
   @Override
   @Override
   @Transactional
   @Transactional
   public OrganizationDTO updateOrganization(OrganizationDTO organizationDTO, String tenantId) {
   public OrganizationDTO updateOrganization(OrganizationDTO organizationDTO, String tenantId) {
+    //选择的组织
     Organization organization = baseMapper.selectById(organizationDTO.getId());
     Organization organization = baseMapper.selectById(organizationDTO.getId());
     Organization parent = null;
     Organization parent = null;
+    //父级组织不为空,则查询到父级组织
     if (StringUtils.isNotBlank(organizationDTO.getParentId())) {
     if (StringUtils.isNotBlank(organizationDTO.getParentId())) {
       Organization parentOrganization = baseMapper.selectById(organizationDTO.getParentId());
       Organization parentOrganization = baseMapper.selectById(organizationDTO.getParentId());
       if (parentOrganization.getTenantId().equals(tenantId)) {
       if (parentOrganization.getTenantId().equals(tenantId)) {
@@ -118,10 +120,10 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     if (organization == null) {
     if (organization == null) {
       return null;
       return null;
     }
     }
+    //数据一致则返回给前端
     if (organization.getName().equals(organizationDTO.getName())
     if (organization.getName().equals(organizationDTO.getName())
         && organization.getSort() == organizationDTO.getSort()
         && organization.getSort() == organizationDTO.getSort()
-        && (organization.getRemark() != null
-            && organization.getRemark().equals(organizationDTO.getRemark()))
+        && (organization.getRemark() != null && organization.getRemark().equals(organizationDTO.getRemark()))
         && Objects.equals(organization.getParentId(), organizationDTO.getParentId())) {
         && Objects.equals(organization.getParentId(), organizationDTO.getParentId())) {
       return organizationDTO;
       return organizationDTO;
     }
     }
@@ -130,6 +132,8 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     organization.setSort(organizationDTO.getSort());
     organization.setSort(organizationDTO.getSort());
     if (parent != null) {
     if (parent != null) {
       organization.setParentId(parent.getId());
       organization.setParentId(parent.getId());
+    }else{
+      organization.setParentId(null);
     }
     }
     baseMapper.updateById(organization);
     baseMapper.updateById(organization);
     organization.copyToDTO(organizationDTO);
     organization.copyToDTO(organizationDTO);
@@ -139,9 +143,11 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
   @Override
   @Override
   public List<OrganizationDTO> getMyOrganizations(
   public List<OrganizationDTO> getMyOrganizations(
       boolean isPtTenantAdmin, String tenantId, String currentUserId) {
       boolean isPtTenantAdmin, String tenantId, String currentUserId) {
+    //如果是租户管理员,则返回该租户id下的所有组织
     if (isPtTenantAdmin) {
     if (isPtTenantAdmin) {
       return findOrganizationTree(tenantId);
       return findOrganizationTree(tenantId);
     } else {
     } else {
+      //返回当前用户组织id集
       Set<String> organizationIds =
       Set<String> organizationIds =
           userOrganizationMappingMapper
           userOrganizationMappingMapper
               .selectList(
               .selectList(
@@ -151,6 +157,7 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
               .stream()
               .stream()
               .map(UserOrganizationMapping::getOrganizationId)
               .map(UserOrganizationMapping::getOrganizationId)
               .collect(Collectors.toSet());
               .collect(Collectors.toSet());
+
       List<Organization> organizations =
       List<Organization> organizations =
           baseMapper.selectList(
           baseMapper.selectList(
               new QueryWrapper<Organization>()
               new QueryWrapper<Organization>()
@@ -161,6 +168,11 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
     }
   }
   }
 
 
+  /**
+   * 查询租户id下的所有组织
+   * @param tenantId
+   * @return
+   */
   private List<OrganizationDTO> findOrganizationTree(String tenantId) {
   private List<OrganizationDTO> findOrganizationTree(String tenantId) {
     List<OrganizationDTO> organizationTreeList =
     List<OrganizationDTO> organizationTreeList =
         baseMapper.findOrganizationTreeList(tenantId, null);
         baseMapper.findOrganizationTreeList(tenantId, null);