整理代码

server-api/server-api.iml

@@ -157,7 +157,6 @@
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.5.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.12" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mqtt:5.5.5" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.9" level="project" />
@@ -184,6 +183,7 @@
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.5" level="project" />
@@ -205,7 +205,6 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" level="project" />

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java

@@ -276,9 +276,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         check(dto);
         dto.setTenantId(TenantIdUtil.getTenantId());
         if (StringUtils.isBlank(dto.getParentId())) {
-            String tenantId = TenantIdUtil.getTenantId();
-            dto.setParentId(tenantId);
-            dto.setPath(tenantId);
         } else {
             PlatOrg parent = getById(dto.getParentId());
             dto.setPath(parent.getPath() + "," + parent.getId());
@@ -302,8 +299,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
     public void edit(PlatOrg dto) {
         check(dto);
         if (StringUtils.isBlank(dto.getParentId())||StringUtils.equals(dto.getParentId(),"1")) {
-            dto.setParentId("1");
-            dto.setPath("1");
         } else {
             PlatOrg parent = getById(dto.getParentId());
             dto.setPath(parent.getPath() + "," + parent.getId());