business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java
@@ -41,4 +41,11 @@ * @return */ ProjectInfo getProjectInfo(@Param("processInsId") String processInstanceId); /** * 查询项目未被删,并且绑定了流程的流程实例id * * @return */ List<String> getNormalInsIds(); } business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -306,9 +306,15 @@ .active() .includeProcessVariables() .orderByTaskCreateTime().desc(); List<String> insIds = baseMapper.getNormalInsIds(); if (CollectionUtils.isEmpty(insIds)) { result.data(new ArrayList<>()).total(0L); return; } else { taskQuery.processInstanceIdIn(insIds); } if (StringUtils.isNotBlank(taskName)) { taskQuery.processDefinitionNameLike(taskName); taskQuery.taskNameLike(taskName); } if (!SecurityUtils.getLoginUser().getUser().isAdmin()) { taskQuery @@ -430,9 +436,6 @@ } this.distinctVo(taskVO); vos.add(taskVO); } if (vos.size() < pageSize) { result.total(vos.size()); } result.put("taskList", vos); } @@ -827,7 +830,7 @@ .desc(); if (StringUtils.isNotBlank(taskName)) { taskQuery.processDefinitionNameLike(taskName); taskQuery.taskNameLike(taskName); } result.total(taskQuery.count()); List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize); business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -84,4 +84,9 @@ INNER JOIN t_project_info PI ON PP.project_id = PI.id AND PI.deleted = 0 AND PP.process_ins_id = #{processInsId} </select> <select id="getNormalInsIds" resultType="string"> SELECT TPP.process_ins_id FROM t_project_info TPI INNER JOIN t_project_process TPP ON TPI.id = TPP.project_id AND TPI.deleted = 0 </select> </mapper>