Bläddra i källkod

待办,已办条件查询

sangwenwei 1 år sedan
förälder
incheckning
4d98cd8c03

+ 10 - 4
jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -368,8 +368,11 @@ public class FlowTaskService {
         if ( flow.getEndDate ( ) != null ) {
             todoTaskQuery.taskCreatedBefore ( flow.getEndDate ( ) );
         }
-        if ( StrUtil.isNotBlank ( flow.getTitle ( ) ) ) {
-            todoTaskQuery.processVariableValueLike ( FlowableConstant.TITLE, "%" + flow.getTitle ( ) + "%" );
+        if (StrUtil.isNotBlank (flow.getTitle ())) {
+            todoTaskQuery.processVariableValueLike ( FlowableConstant.TITLE, "%" + flow.getTitle () + "%");
+        }
+        if (StringUtils.isNotEmpty(flow.getAssigneeId())) {
+            todoTaskQuery.processVariableValueEquals ( flow.getAssigneeId());
         }
 
 
@@ -427,6 +430,9 @@ public class FlowTaskService {
         if ( act.getTitle ( ) != null ) {
             histTaskQuery.processVariableValueLike ( FlowableConstant.TITLE, "%" + act.getTitle ( ) + "%" );
         }
+        if (StringUtils.isNotEmpty(act.getAssigneeId())) {
+            histTaskQuery.processVariableValueEquals ( act.getAssigneeId());
+        }
 
         // 查询总数
         page.setTotal ( histTaskQuery.count ( ) );
@@ -611,7 +617,7 @@ public class FlowTaskService {
      */
     public String startProcess(String procDefKey, String businessTable, String businessId, String title, String procDefId) {
         Map <String, Object> vars = Maps.newHashMap ( );
-        return startProcess ( procDefKey, businessTable, businessId, title, vars , procDefId);
+        return startProcess ( procDefKey, businessTable, businessId, title,  vars , procDefId);
     }
 
     /**
@@ -625,7 +631,7 @@ public class FlowTaskService {
      * @return 流程实例ID
      */
     @SuppressWarnings("unused")
-    public String startProcess(String procDefKey, String businessTable, String businessId, String title, Map <String, Object> vars, String procDefId) {
+    public String startProcess(String procDefKey, String businessTable, String businessId, String title, Map <String, Object> vars,  String procDefId) {
         //String userId = UserUtils.getUser().getLoginName();//ObjectUtils.toString(UserUtils.getUser().getId())
         // 设置流程变量
         if ( vars == null ) {