优化代码

java110-bean/src/main/java/com/java110/vo/api/staff/ApiStaffDataVo.java

@@ -36,6 +36,8 @@ public class ApiStaffDataVo implements Serializable {
 
     private String parentOrgName;
 
+    private String orgLevel;
+
     private String staffId;
 
     private String staffName;
@@ -213,4 +215,12 @@ public class ApiStaffDataVo implements Serializable {
     public void setRelCdName(String relCdName) {
         this.relCdName = relCdName;
     }
+
+    public String getOrgLevel() {
+        return orgLevel;
+    }
+
+    public void setOrgLevel(String orgLevel) {
+        this.orgLevel = orgLevel;
+    }
 }

java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml

@@ -213,7 +213,7 @@
         WHERE 1 =1
         and u.unit_id = #{unitId}
         and t.community_id= #{communityId}
-        order by CONVERT(t.layer,SIGNED) ,t.room_num
+        order by CONVERT(t.layer,SIGNED),CONVERT(t.room_num,SIGNED)
     </select>
 
 </mapper>

service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java

@@ -130,6 +130,12 @@ public class QueryStaffInfosCmd extends Cmd {
             if (!apiStaffDataVo.getParentOrgId().equals(orgDto.getOrgId())) { // 他自己跳过
                 continue;
             }
+
+            //如果到一级 就结束
+            if(OrgDto.ORG_LEVEL_STORE.equals(apiStaffDataVo.getOrgLevel())){
+                continue;
+            }
+
             apiStaffDataVo.setParentOrgId(orgDto.getParentOrgId());
 
             if (StringUtil.isEmpty(apiStaffDataVo.getOrgName())) {
@@ -137,6 +143,7 @@ public class QueryStaffInfosCmd extends Cmd {
                 continue;
             }
             apiStaffDataVo.setOrgName(orgDto.getOrgName() + " / " + apiStaffDataVo.getOrgName());
+            apiStaffDataVo.setOrgLevel(orgDto.getOrgLevel());
         }
 
         if (curOrgDto != null && OrgDto.ORG_LEVEL_STORE.equals(curOrgDto.getOrgLevel())) {