合并分支 'master' 到 'dev'

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

@@ -89,6 +89,13 @@ public class UnitsController {
         return ResponseEntity.ok(unitsService.findBySubordinate(unitsId));
     }
 
+    @GetMapping(value = "/find/units/superiorAll/{unitsId}")
+    @ApiOperation(value = "根据当前用户的单位ID查询下级单位对象(包括自己单位，以及省包括代管单位)", notes = "包括自己单位，以及省包括代管单位")
+    public ResponseEntity findLastUnits3(@PathVariable Integer unitsId) {
+        return ResponseEntity.ok(unitsService.findBySubordinateAll(unitsId));
+    }
+
+
     @GetMapping(value = "/findBySubordinateNotOneself/{unitsId}")
     @ApiOperation(value = "根据当前用户的单位ID查询下级单位对象不包括本级", notes = "单位")
     public ResponseEntity findBySubordinateNotOneself(@PathVariable Integer unitsId) {

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

@@ -97,6 +97,14 @@ public interface UnitsService extends PublicService<Units> {
     List<Units> findBySubordinate(Integer unitsId);
 
 
+    /**
+     * 根据单位id查询下级级对象
+     *
+     * @param unitsId 单位id
+     * @return 单位对象
+     */
+    List<Units> findBySubordinateAll(Integer unitsId);
+
     /**
      * 根据单位id查询下级级对象(不包括自己)
      *

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

@@ -188,6 +188,18 @@ public class UnitsServiceImpl implements UnitsService {
        return units1.stream().sorted(Comparator.comparing(Units::getShowOrder)).distinct().collect(Collectors.toList());
     }
 
+    @Override
+    public List<Units> findBySubordinateAll(Integer unitsId) {
+        Units units =  unitsDao.findById(unitsId).get();
+        List<Integer> areaIds= areaDao.findAllByFatherId(units.getAreaId()).stream().filter(area -> area.getType() <= 3).map(Area::getId).collect(Collectors.toList());
+        List<Units> units1=  unitsDao.findAllByAreaIdIn(areaIds);
+        if (units.getLevel()==1){
+            units1.addAll(unitsDao.findAllByType(2));
+        }
+        units1.add(units);
+        return units1.stream().sorted(Comparator.comparing(Units::getShowOrder)).distinct().collect(Collectors.toList());
+    }
+
     @Override
     public List<Units> findBySubordinateNotOneself(Integer unitsId) {
         Units units =  unitsDao.findById(unitsId).get();