条件添加

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EmergencyTaskController.java

@@ -88,7 +88,7 @@ public class EmergencyTaskController extends BaseController{
 
     @ApiOperation(httpMethod = "GET",value = "分工内容列表", notes = "分工内容列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResponse list(Long obligationId ,@RequestParam int pageNumber,
+    public CommonResponse list(Long obligationId , @RequestParam(required = false) String planType,@RequestParam int pageNumber,
                                @RequestParam  int pageSize){
         if (pageNumber >=1 ){
             pageNumber = pageNumber -1 ;
@@ -97,8 +97,7 @@ public class EmergencyTaskController extends BaseController{
             obligationId = null;
         }
         CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
-        String planType = null;
-        if (redisTemplate.hasKey("planType")) {
+        if (StringUtils.isEmpty(planType) && redisTemplate.hasKey("planType")) {
             planType = redisTemplate.boundValueOps("planType").get(0, -1);
         }
         Page<EmergencyTaskContent> list = iEmergencyTaskService.list(obligationId, planType, commonPageable);