修改填报单位的获取

src/main/java/com/keymobile/indicators/api/hytobacco/TaskRuleCtrl.java

@@ -45,13 +45,14 @@ public class TaskRuleCtrl {
     @ApiOperation("根据规则类型和关键字分页查找任务规则")
     @GetMapping("findByPage")
     public Page<TaskRule> findByPage(@ApiParam("规则类型：1 省级 2 市级 3 县级")
-                                         @RequestParam(value = "ruleType", defaultValue = "1", required = false) int ruleType,
+                                         @RequestParam(value = "ruleType", defaultValue = "1", required = false) Integer ruleType,
                                      @ApiParam("任务层级：省对市、省对县、市对县")
                                      @RequestParam(value = "ruleLevel", required = false) String ruleLevel,
                                      @ApiParam("搜索关键字（名字）")@RequestParam(value = "keyword", required=false) String keyword,
                                      @ApiParam("页码，从1开始") @RequestParam(value ="page",defaultValue = "1") int page,
                                      @ApiParam("每页条数")
                                          @RequestParam(value ="pageSize", defaultValue = "10") int pageSize) {
+        ruleType = null;
         return taskRuleService.findRuleByPage(ruleType, ruleLevel, keyword, page, pageSize);
     }
 

src/main/java/com/keymobile/indicators/api/hytobacco/TaskRuleGroupObjCtrl.java

@@ -70,7 +70,7 @@ public class TaskRuleGroupObjCtrl {
     @ApiOperation("分页查找任务单位对象信息")
     @PostMapping("find")
     public Page<TaskRuleGroupObj> find(@ApiParam("规则类型：1 省级 2 市级 3 县级")
-                                       @RequestParam(value = "ruleType", defaultValue = "1", required = false) int ruleType,
+                                       @RequestParam(value = "ruleType", defaultValue = "1", required = false) Integer ruleType,
                                        @ApiParam("任务层级：省对市、省对县、市对县")
                                        @RequestParam(value = "ruleLevel", required = false) String ruleLevel,
                                        @ApiParam("数据对象类型：1、组织机构 2、人员 3、岗位")
@@ -79,6 +79,7 @@ public class TaskRuleGroupObjCtrl {
                                        @ApiParam("页码，从1开始") @RequestParam(value = "page", defaultValue = "1") int page,
                                        @ApiParam("每页条数")
                                        @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+        ruleType = null;
         long total = taskRuleGroupObjService.findCount(ruleType, ruleLevel, objType, keyword);
         PageRequest request = PageRequest.of(page - 1, pageSize);
         List<TaskRuleGroupObj> list = new ArrayList<>();