diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index 39448850..b4d9dff7 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -158,7 +158,7 @@ public class FlowTaskController extends BaseController { @ResponseBody public ResultVo completeBatch(@RequestBody FlowApprove approve, HttpServletRequest request) { String tenantId = request.getHeader("X-Tenant-Id"); - if(StringUtils.isBlank(tenantId)){ + if (StringUtils.isBlank(tenantId)) { return ResultVoUtil.error("租户主键不能为空"); } approve.setDeptid(tenantId); @@ -317,8 +317,8 @@ public class FlowTaskController extends BaseController { } //获取用户预设检索条件id,如果存在检索条件,则高级检索失效 - String userSearchId = ""; - if(StringUtils.isBlank(taskName)){ + String userSearchId = ""; + if (StringUtils.isBlank(taskName)) { userSearchId = request.getParameter("userSearchId"); } @@ -327,7 +327,7 @@ public class FlowTaskController extends BaseController { flowTaskService.getMyProcessInstances(searchQuery.getQuery(), pageUtils); } else { - flowTaskService.getMyProcessInstances(user, tenantId, searchQuery.getQuery(), pageUtils,userSearchId); + flowTaskService.getMyProcessInstances(user, tenantId, searchQuery.getQuery(), pageUtils, userSearchId); //待办信息,增加是否查看标记 // if(StringUtils.isNotBlank(assigneeId) && assigneeId.equals(user.getId().toString())){ @@ -401,8 +401,8 @@ public class FlowTaskController extends BaseController { searchQuery.addEqual("fromuserid", izupuser); } } - if(StringUtils.isNotBlank(taskName)){ - searchQuery.addLike("fromtaskname",taskName); + if (StringUtils.isNotBlank(taskName)) { + searchQuery.addLike("fromtaskname", taskName); } if (org.springframework.util.StringUtils.hasText(izproject)) { if (izproject.contains(",")) { @@ -432,13 +432,9 @@ public class FlowTaskController extends BaseController { } else { searchQuery.addEqual("states", izstatus); } - }else{ - if(Boolean.parseBoolean(isFail)){ - searchQuery.addEqual("isFail","1"); - searchQuery.addIn("states", Arrays.asList("2","3","5")); - }else{ - searchQuery.addIn("states", Arrays.asList("2","3")); - } + } + if (Boolean.parseBoolean(isFail)) { + searchQuery.addEqual("isFail", "1"); } if (org.springframework.util.StringUtils.hasText(iztaskrrom)) { if (iztaskrrom.contains(",")) { @@ -643,7 +639,7 @@ public class FlowTaskController extends BaseController { String fromid = request.getParameter("fromid"); String taskid = request.getParameter("taskid"); String deptid = request.getParameter("deptid"); - return flowTaskService.removeTask(fromid, taskid,deptid); + return flowTaskService.removeTask(fromid, taskid, deptid); //return ResultVoUtil.success(); } @@ -664,7 +660,7 @@ public class FlowTaskController extends BaseController { String fromid = request.getParameter("fromid"); String taskid = request.getParameter("buessinessno"); String deptid = request.getParameter("deptid"); - return flowTaskService.removeTask(fromid, taskid,deptid); + return flowTaskService.removeTask(fromid, taskid, deptid); //return ResultVoUtil.success(); }