diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
index 63faca6404..eb43f7840b 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
@@ -186,6 +186,11 @@ public class FlowableRest implements FlowableFeign {
             return rb.setMsg("抄送失败，流程定义不存在！");
         }
         mfq.setModuleName(process.get("NAME_"));
+        if(processVariables.containsKey("orderNames")){
+            mfq.setMsgTitle(processVariables.get("orderNames").toString());
+        }else{
+            mfq.setMsgTitle(process.get("NAME_"));
+        }
         mfq.setMsgTitle(process.get("NAME_"));
         mfq.setUserSids(userSids.toString());
         ResultBean<String> resultBean = messageFeign.pushMessageCC(mfq);
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
index e392111903..ade8538b75 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
@@ -150,15 +150,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN ACT_RE_PROCDEF arpd ON ahpi.PROC_DEF_ID_ = arpd.ID_
             LEFT JOIN sys_form_link sfl ON ahpi.PROC_INST_ID_ = sfl.procInsId
             <where>
-                <if test="proDefName != null and proDefName != ''">
+                <!--<if test="proDefName != null and proDefName != ''">
                     AND arpd.NAME_ LIKE concat('%',#{proDefName},'%')
-                </if>
+                </if>-->
                 <if test="startDate != null and startDate != ''">
                     AND ahpi.START_TIME_ <![CDATA[ >=  ]]> #{startDate}
                 </if>
                 <if test="endDate != null and endDate != ''">
                     AND ahpi.START_TIME_ <![CDATA[ <=  ]]> #{endDate}
                 </if>
+                <if test="names != null and names != ''">
+                    and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{names},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%'))
+                </if>
             </where>
         ) flow
         GROUP BY flow.PROC_INST_ID_
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index 2b18bb1de4..3ce16a9139 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -500,6 +500,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 if(StringUtils.isNotBlank(orgPath)){
                   //  or.taskVariableValueLike("orgPath", "%" + orgPath + "%");
                 }
+                if(StringUtils.isNotBlank(names)){
+                    or.or();
+                    or.taskVariableValueLike("orderNames", "%" + names + "%").processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
+                    or.endOr();
+                }
                 //.taskCandidateGroupIn(roleSidList)
                 or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();
@@ -510,13 +515,13 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         if (paramMap.get("endDate") != null && StringUtils.isNotBlank(paramMap.get("endDate").toString())) {
             taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
         }
-        if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
+        /*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
             taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
-        }
-      /*  page.setTotal(taskQuery.count());
-        int p = (pageNum - 1) * pageSize;*/
-//        List<Task> taskList = taskQuery.listPage(p, pageSize);
-        List<Task> taskList = taskQuery.list();
+        }*/
+        page.setTotal(taskQuery.count());
+        int p = (pageNum - 1) * pageSize;
+        List<Task> taskList = taskQuery.listPage(p, pageSize);
+//        List<Task> taskList = taskQuery.list();
         List<FlowTaskDto> flowList = new ArrayList<>();
         for (Task task : taskList) {
             FlowTaskDto flowTask = new FlowTaskDto();
@@ -578,7 +583,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowList.add(flowTask);
         }
         //筛选发起人==============================
-        if (StringUtils.isNotBlank(startUserNameParams)) {
+        /*if (StringUtils.isNotBlank(startUserNameParams)) {
             String finalStartUserNameParams = startUserNameParams;
             flowList = flowList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
         }
@@ -588,7 +593,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         }
         page.setTotal(flowList.size());
         flowList = flowList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
-                collect(Collectors.toList());
+                collect(Collectors.toList());*/
         page.setRecords(flowList);
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
         return rb.success().setData(page);
@@ -716,18 +721,19 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             }
             ll.add(mapss);
             //查询条件发起人
-            if("startUserName".equals(btq.getField())){
+           /* if("startUserName".equals(btq.getField())){
                 paraMap.remove("startUserName");
                 startUserNameParams = btq.getValue();
             }
             if("proDefName".equals(btq.getField())){
                 names = btq.getValue();
-            }
+                paraMap.put("names",names);
+            }*/
         }
         paraMap.put("userSid", userSid);
         paraMap.put("list", ll);
-       /* paraMap.put("page", (pageNum - 1) * pageSize);
-        paraMap.put("size", pageSize);*/
+        paraMap.put("page", (pageNum - 1) * pageSize);
+        paraMap.put("size", pageSize);
         List<Map<String, Object>> maps = baseMapper.finishedList1(paraMap);
         int count = baseMapper.finishedListCount(paraMap);
         List<FlowTaskDto> hisTaskList = new ArrayList();
@@ -816,7 +822,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             hisTaskList.add(flowTask);
         }
         //对hisTaskList进行筛选发起人
-        if (StringUtils.isNotBlank(startUserNameParams)) {
+       /* if (StringUtils.isNotBlank(startUserNameParams)) {
             String finalStartUserNameParams = startUserNameParams;
             hisTaskList = hisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
         }
@@ -826,8 +832,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         }
         page.setTotal(hisTaskList.size());
         hisTaskList = hisTaskList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
-                collect(Collectors.toList());
-//        page.setTotal(count);
+                collect(Collectors.toList());*/
+        page.setTotal(count);
         page.setRecords(hisTaskList);
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
         return rb.success().setData(page);
@@ -860,14 +866,15 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             ll.add(mapss);
             if("proDefName".equals(btq.getField())){
                 names = btq.getValue();
+                paraMap.put("names",names);
                 paraMap.remove("proDefName");
             }
         }
 
         paraMap.put("userSid", userSid);
         paraMap.put("list", ll);
-       /* paraMap.put("page", (pageNum - 1) * pageSize);
-        paraMap.put("size", pageSize);*/
+        paraMap.put("page", (pageNum - 1) * pageSize);
+        paraMap.put("size", pageSize);
         List<Map<String, Object>> maps = baseMapper.finishedList1(paraMap);
         int count = baseMapper.finishedListCount(paraMap);
         List<FlowTaskDto> hisTaskList = new ArrayList();
@@ -963,7 +970,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         List<FlowTaskDto> userHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
         List<FlowTaskDto> namesHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
         //对hisTaskList进行筛选发起人
-        if (StringUtils.isNotBlank(names)) {
+     /*   if (StringUtils.isNotBlank(names)) {
             String finalStartUserNameParams = names;
             userHisTaskList = userHisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
             namesHisTaskList = namesHisTaskList.stream().filter(v -> v.getProcDefName().contains(finalStartUserNameParams)).collect(Collectors.toList());
@@ -974,9 +981,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         page.setTotal(finallyList.size());
         finallyList = finallyList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
                 collect(Collectors.toList());
-//        page.setTotal(count);
-//        page.setRecords(hisTaskList);
-        page.setRecords(finallyList);
+        page.setRecords(finallyList);*/
+        page.setTotal(count);
+        page.setRecords(hisTaskList);
+
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
         return rb.success().setData(page);
     }
@@ -1989,7 +1997,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             }
             if("proDefName".equals(btq.getField())){
                 names = btq.getValue();
-                paramMap.remove("proDefName");
             }
         }
         TaskQuery or = taskQuery.active()
@@ -1997,6 +2004,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 ;
         if(StringUtils.isNotBlank(orgPath)){
              /* or.taskVariableValueLike("orgPath",  "%" + orgPath + "%");*/
+        }
+        if(StringUtils.isNotBlank(names)){
+            or.or();
+            or.taskVariableValueLike("orderNames", "%" + names + "%").processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
+            or.endOr();
         }
                 or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();
@@ -2010,10 +2022,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         /*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
             taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
         }*/
-       /* page.setTotal(taskQuery.count());
+        page.setTotal(taskQuery.count());
         int p = (pageNum - 1) * pageSize;
-        List<Task> taskList = taskQuery.listPage(p, pageSize);*/
-        List<Task> taskList = taskQuery.list();
+        List<Task> taskList = taskQuery.listPage(p, pageSize);
+//        List<Task> taskList = taskQuery.list();
         List<FlowTaskDto> flowList = new ArrayList<>();
         for (Task task : taskList) {
             FlowTaskDto flowTask = new FlowTaskDto();
@@ -2081,7 +2093,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowList.add(flowTask);
         }
         //对flowList进行筛选发起人======================
-        List<FlowTaskDto> userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
+        /*List<FlowTaskDto> userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
         List<FlowTaskDto> namesHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
         if (StringUtils.isNotBlank(names)) {
             String finalStartUserNameParams = names;
@@ -2093,8 +2105,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         finallyList.addAll(userHisTaskList);
         page.setTotal(finallyList.size());
         finallyList = finallyList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
-                collect(Collectors.toList());
-        page.setRecords(finallyList);
+                collect(Collectors.toList());*/
+        page.setRecords(flowList);
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
         return rb.success().setData(page);
     }