【用户】 添加查询下一级单位集合

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java

@@ -37,10 +37,12 @@ public class UnitsController {
 
     @GetMapping(value = "/findAll/{level}")
     @ApiOperation(value = "根据等级查询对应等级的单位集合", notes = "单位集合")
-    public ResponseEntity deleteUser(@PathVariable Integer level) {
+    public ResponseEntity findAll2(@PathVariable Integer level) {
         return ResponseEntity.ok(unitsService.findListById(level));
     }
 
+
+
     @GetMapping(value = "/findAll")
     @ApiOperation(value = "查询所有单位", notes = "单位集合")
     public ResponseEntity findAlls() {
@@ -67,6 +69,12 @@ public class UnitsController {
         return ResponseEntity.ok(unitsService.findByAreaId(unitsId));
     }
 
+    @GetMapping(value = "/find/units/superior/{unitsId}")
+    @ApiOperation(value = "根据当前用户的单位ID查询下级单位对象", notes = "单位")
+    public ResponseEntity findLastUnits1(@PathVariable Integer unitsId) {
+        return ResponseEntity.ok(unitsService.findSuperiorByunitsId(unitsId));
+    }
+
     @PostMapping(value = "/save")
     @ApiOperation(value = "添加单位接口", notes = "单位")
     public ResponseEntity saveUnits(@RequestBody Units units){

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

@@ -17,8 +17,14 @@ public interface UnitsService extends PublicService<Units> {
 
     Units findById(Integer unitId);
 
+    /**
+     * 下级全部单位
+     * @param leven 等级
+     * @return
+     */
     List<Units> findListById(Integer leven);
 
+
     /**
      * 装备管理 人员管理 组织结构列表
      * @param securityUser
@@ -28,6 +34,8 @@ public interface UnitsService extends PublicService<Units> {
 
     List<Units> findListlevenGreaterThanEqual(Integer leven);
 
+
+
     /**
      * 查询下属单位id集合
      *
@@ -72,6 +80,14 @@ public interface UnitsService extends PublicService<Units> {
      */
     Units findByAreaId(Integer unitsId);
 
+    /**
+     * 根据区域id查询下级级对象
+     *
+     * @param unitsId 单位id
+     * @return 单位对象
+     */
+    List<Units> findBySubordinate(Integer unitsId);
+
 
     UnitsPage selectPage(Integer page, Integer size);
 

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

@@ -103,8 +103,13 @@ public class UnitsServiceImpl implements UnitsService {
                 List<UnitsVo> unitsList = unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toVo).collect(Collectors.toList());
                 List<Area> countys = areaDao.findAllByFatherId(area.getId());
                 if (countys != null && countys.size() != 0) {
-                    List<UnitsVo> countyUnitsList = unitsDao.findAllByAreaId(countys.get(0).getId()).stream().map(Units::toVo).collect(Collectors.toList());
-                    unitsList.addAll(countyUnitsList);
+                    countys.forEach(
+                            area1 -> {
+                                List<UnitsVo> countyUnitsList = unitsDao.findAllByAreaId(area1.getId()).stream().map(Units::toVo).collect(Collectors.toList());
+                                unitsList.addAll(countyUnitsList);
+                            }
+                    );
+
                 }
                 for (UnitsVo unitsVo : unitsList) {
                     unitsVo.setFrontEnd(i++);
@@ -140,6 +145,7 @@ public class UnitsServiceImpl implements UnitsService {
         return unitsDao.findAllByLevelGreaterThanEqual(leven);
     }
 
+
     @Override
     public List<Integer> findListSubordinateId(Integer unitsId) {
       Integer areaId = unitsDao.findById(unitsId).get().getAreaId();
@@ -186,6 +192,14 @@ public class UnitsServiceImpl implements UnitsService {
 
     }
 
+    @Override
+    public List<Units> findBySubordinate(Integer unitsId) {
+       Units units =  unitsDao.findById(unitsId).get();
+      List<Integer> areaIds= areaDao.findAllByFatherId(units.getAreaId()).stream().map(Area::getId).collect(Collectors.toList());
+
+        return unitsDao.findAllByAreaIdIn(areaIds);
+    }
+
     @Override
     public UnitsPage selectPage(Integer page, Integer size) {
         Pageable pageable = PageRequest.of(page, size, Sort.Direction.ASC, "level");