[update] 辖区校验

signal-control-service/src/main/java/net/wanji/web/controller/SituationDetectionController.java

@@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.ws.rs.core.MediaType;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -173,7 +175,7 @@ public class SituationDetectionController extends BaseController {
     @AspectLog(description = "辖区分组", operationType = BaseEnum.OperationTypeEnum.QUERY)
     @ApiOperation(value = "辖区分组", notes = "辖区分组")
     @GetMapping("/jurisdictionTree")
-    public JsonViewObject jurisdictionTree(Integer areaId, Integer type) throws Exception {
+    public JsonViewObject jurisdictionTree(Integer areaId, @RequestParam Integer type) throws Exception {
         List<JurisdictionAreaTreeVO> result = situationDetectionService.jurisdictionTree(areaId, type);
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         return jsonViewObject.success(result);

signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java

@@ -419,7 +419,9 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         List<TBaseAreaInfo> tBaseAreaInfos = tBaseAreaInfoMapper.selectList(queryWrapper);
         List<Integer> areadCodeList = tBaseAreaInfos.stream().map(TBaseAreaInfo::getCode).collect(Collectors.toList());
         LambdaQueryWrapper<TBaseAreaCross> crossQuery = new LambdaQueryWrapper<>();
-        crossQuery.in(TBaseAreaCross::getAreaId, areadCodeList);
+        if (!CollectionUtils.isEmpty(areadCodeList)) {
+            crossQuery.in(TBaseAreaCross::getAreaId, areadCodeList);
+        }
         List<TBaseAreaCross> tBaseAreaCrosses = tBaseAreaCrossMapper.selectList(crossQuery);
 
         LambdaQueryWrapper<TBaseCrossInfo> crossInfoQuery = new LambdaQueryWrapper<>();