Master

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -147,7 +147,9 @@ public class DeviceCheckController {
     @GetMapping("/unit")
     @ApiOperation(value = "查询默认的可以被核查单位的清单(省本直,省直属,市局)")
     public ResponseEntity findDefaultUnits() {
-        return ResponseEntity.ok(new ResultObj<>(unitsRepo.findAllByTypeNotInAndLevelIn(Lists.newArrayList(3), Lists.newArrayList(0, 1, 2))));
+        return ResponseEntity.ok(new ResultObj<>(unitsRepo.findAllByTypeInOrLevelIn(
+                Lists.newArrayList(2),
+                Lists.newArrayList(1, 2))));
     }
 
     /**

dev-user/src/main/java/com/tykj/dev/device/user/subject/dao/UnitsDao.java

@@ -22,6 +22,8 @@ public interface UnitsDao extends JpaRepository<Units, Integer>, JpaSpecificatio
 
     List<Units> findAllByTypeNotInAndLevelIn(List<Integer> ids,List<Integer> levels);
 
+    List<Units> findAllByTypeInOrLevelIn(List<Integer> typeIds, List<Integer> levelIds);
+
     List<Units> findByAreaIdIn(List<Integer> areaIds);
 
     List<Units> findAllByAreaIdIn(List<Integer> ids);