任务 7480 7481

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1270,7 +1270,27 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //1.组装数据
         List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(authKey);
         //2.list to tree
-        return companyBuildingList.stream().filter(a -> companyBuildingList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId()))).peek(b -> b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyBuildingList))).collect(Collectors.toList());
+        List<BuildingTreeVo> buildingTreeVos = companyBuildingList.stream().filter(a -> companyBuildingList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId()))).peek(b -> b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyBuildingList))).collect(Collectors.toList());
+        // 任务 7481
+        if(buildingTreeVos.size() == 1 && buildingTreeVos.get(0).getChildren().size() > 0) {
+            List<BuildingTreeVo> buildingTreeVosNew = buildingTreeVos.get(0).getChildren().stream().sorted(new Comparator<BuildingTreeVo>() {
+                @Override
+                public int compare(BuildingTreeVo o1, BuildingTreeVo o2) {
+                    if(o1.getGroupType().equals(o2.getGroupType())) {
+                        return 0;
+                    }
+                    if(o1.getGroupType().equals("building")  ) {
+                        return -1;
+                    }
+                    if(o2.getGroupType().equals("building") ) {
+                        return 1;
+                    }
+                    return 0;
+                }
+            }).collect(Collectors.toList());
+            buildingTreeVos.get(0).setChildren(buildingTreeVosNew);
+        }
+        return buildingTreeVos;
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java

@@ -81,7 +81,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
         List<EquipmentManageVo> utils = equipmentManageMapper.getUtils();
 
         List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
-                .eq(DynamicFormGroup::getOrgCode, orgCode)
+                //.eq(DynamicFormGroup::getOrgCode, orgCode)  任务 7480
                 .eq(DynamicFormGroup::getParentId, 0)
                 .orderByDesc(BaseEntity::getCreateDate));
      // List<EquipmentManageVo> systemList = equipmentManageMapper.getSystemList();