Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/entity/platform/auth/PlatOrg.java

@@ -63,6 +63,10 @@ public class PlatOrg extends BaseBusEntity {
     @TableField(exist = false)
     @TableField(exist = false)
     private PlatOrg parent;
     private PlatOrg parent;
 
 
+    @ApiModelProperty(value = "级别")
+    @TableField(exist = false)
+    private Integer grade;
+
     private String remark;
     private String remark;
 
 
 }
 }
\ No newline at end of file

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

@@ -607,6 +607,10 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         if(CollectionUtils.isEmpty(list)){
         if(CollectionUtils.isEmpty(list)){
             return new ArrayList<>();
             return new ArrayList<>();
         }
         }
+        list = list.stream().map(org -> {
+            org.setGrade(org.getPath().split(",").length);
+            return org;
+        }).collect(Collectors.toList());
         return createOrgTree(list);
         return createOrgTree(list);
     }
     }