Browse Source

[task-1595]首页待办返回记录数,已办数量和已办列表数据对不上

szjbdgzl 2 years ago
parent
commit
d09edbeefd

+ 3 - 1
ibps-bpmnbase-root/modules/bpmn-model/src/main/resources/com/lc/ibps/bpmn/persistence/mapping/BpmTask.map.xml

@@ -279,7 +279,9 @@
 			<if test="@o.Ognl@isNotEmpty(whereSql)">
 				AND ${whereSql}
 			</if>
-			
+		    <if test="@o.Ognl@isNotEmpty(procDefName)">
+			   AND temp.PROC_DEF_NAME_ like #{procDefName}
+		    </if>
 			<!-- 获得任务类型,NORMAL普通,AGENT代理,DELIVERTO转办 -->
 			<if test="taskType!=null">
 				<if test="taskType!='NORMAL'">

+ 4 - 0
ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/office/provider/BpmReceivedProvider.java

@@ -305,6 +305,10 @@ public class BpmReceivedProvider extends GenericProvider implements IBpmReceived
 		}
 		
 		// 查询列表
+		if (request.getCustoms()!=null){
+			queryFilter.addParamsFilter("procDefName", "%" + request.getCustoms().get("procDefName") + "%");
+		}
+
 		bpmTaskRepository.setForUpdate();
 		List<BpmTaskPo> list = bpmTaskRepository.queryByUser(userId, groups, queryFilter);// 待办 重新构造添加查询group
 		bpmTaskRepository.removeForUpdate();