[装备] 查询接口修改

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -127,9 +127,16 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         //areId不为空，查询某个区域下的所有单位的所有装备
         else {
             //查询区域等级
-            Integer selectLevel = userPublicService.getArea(selectAreaId).getType();
-            //查询该区域下的所有单位
-            List<String> units = userPublicService.findAllUnitNameByAreaId(selectAreaId);
+            Integer selectLevel;
+            List<String> units;
+            if (selectAreaId==0){
+                selectLevel=2;
+                units = userPublicService.findAllUnitNameByType2();
+            }else {
+                 selectLevel = userPublicService.getArea(selectAreaId).getType();
+                //查询该区域下的所有单位
+                 units = userPublicService.findAllUnitNameByAreaId(selectAreaId);
+            }
             //市或县筛选出装备所属单位在units列表中的装备
             if (selectLevel == 3 || selectLevel == 2) {
                 List<DeviceLibrary> libraryEntities = getAllList(deviceLibrarySelectVo).stream()

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UserPublicService.java

@@ -38,6 +38,8 @@ public interface UserPublicService {
 
     List<String> findAllUnitNameByAreaId(Integer areaId);
 
+    List<String> findAllUnitNameByType2();
+
     Integer findUnitIdByName(String unitName);
 
     /**

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserPublicServiceImpl.java

@@ -80,6 +80,11 @@ public class UserPublicServiceImpl implements UserPublicService {
         return unitsNameList;
     }
 
+    @Override
+    public List<String> findAllUnitNameByType2() {
+        return unitsDao.findAll().stream().filter(units1 -> units1.getType()==2).map(Units::getName).collect(Collectors.toList());
+    }
+
     @Override
     public Integer findUnitIdByName(String unitName) {
         return unitsDao.findByName(unitName).getUnitId();