diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
index 6bd8258a..a9fc3e2c 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
@@ -119,8 +119,68 @@ public class TodoTaskController extends BaseAction {
         }
         // 获取查询列表
 //		List<Task> list = nativeTaskQuery.listPage((current - 1) * size, size);
-        List<Task> list = nativeTaskQuery.list();
+        List<Task> tasks = nativeTaskQuery.list();
+        List<Task> list = new ArrayList<>();
+        if(taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")){
+            if(taskCommonQuery.getPrcType().equals("buss1") || taskCommonQuery.getPrcType().equals("25")){
+                for (Task data: tasks){
+                    if(taskCommonQuery.getPrcType().equals("buss1")){
+                        QueryWrapper<BusProcessNew> objectQueryWrapperNew = new QueryWrapper<>();
+                        objectQueryWrapperNew.eq("TASK_ID",data.getId());
+                        BusProcessNew oneNew = iBusProcessNewService.getOne(objectQueryWrapperNew);
+                        if(oneNew!=null){
+                            QueryWrapper<BusProcessName> objectQueryWrapperName = new QueryWrapper<>();
+                            objectQueryWrapperName.eq("PRC_ID",oneNew.getPId());
+                            BusProcessName oneName = iBusProcessNameService.getOne(objectQueryWrapperName);
+                            if (oneName!=null){
+                                if(StringUtils.isNotBlank(oneName.getPrcType())){
+                                    if(oneName.getPrcType().equals("buss1")){
+                                        list.add(data);
+                                    }
+                                    if(oneName.getPrcType().equals("25")){
+                                        if(data.getName().equals("技术标准起草")){
+                                            list.add(data);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if(taskCommonQuery.getPrcType().equals("25")){
+                        QueryWrapper<BusProcessNew> objectQueryWrapperNew = new QueryWrapper<>();
+                        objectQueryWrapperNew.eq("TASK_ID",data.getId());
+                        BusProcessNew oneNew = iBusProcessNewService.getOne(objectQueryWrapperNew);
+                        if(oneNew!=null){
+                            QueryWrapper<BusProcessName> objectQueryWrapperName = new QueryWrapper<>();
+                            objectQueryWrapperName.eq("PRC_ID",oneNew.getPId());
+                            BusProcessName oneName = iBusProcessNameService.getOne(objectQueryWrapperName);
+                            if (oneName!=null){
+                                if(StringUtils.isNotBlank(oneName.getPrcType())){
+                                    if(oneName.getPrcType().equals("25")){
+                                        if(!data.getName().equals("技术标准起草")){
+                                            list.add(data);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+
+                    }
+                }
+
+            }else {
+                for (Task data: tasks){
+                    list.add(data);
+                }
+            }
+        }else {
+            for (Task data: tasks){
+                list.add(data);
+            }
+        }
         List<Map<String, Object>> listEnd = ActivitiTools.turnTasks(list);
+
         for (Map<String, Object> map : listEnd) {
             ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(map.get("processDefinitionId") + "").singleResult();
             map.put("processInstanceName", processDefinition.getName());
@@ -155,8 +215,18 @@ public class TodoTaskController extends BaseAction {
             if (taskCommonQuery.getPrcName() != null && !taskCommonQuery.getPrcName().equals("")) {
                 queryWrapper.like("PRC_NAME", taskCommonQuery.getPrcName());
             }
+//            if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
+//                queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+//            }
             if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
-                queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+                if(taskCommonQuery.getPrcType().equals("buss1")){
+                    //技术制修订
+                    String prcType = taskCommonQuery.getPrcType()+","+25;
+                    String[] split = prcType.split(",");
+                    queryWrapper.in("PRC_TYPE", split);
+                }else {
+                    queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+                }
             }
             BusProcessName busProcessName = iBusProcessNameService.getOne(queryWrapper);
             String taskIds = "";
@@ -183,109 +253,6 @@ public class TodoTaskController extends BaseAction {
 
         }
 
-        if(taskCommonQuery.getPrcType().equals("buss1") && taskCommonQuery.getTag()){
-            QueryWrapper<BusProcessName> objectQueryWrapper = new QueryWrapper<>();
-            objectQueryWrapper.eq("PRC_TYPE",25);
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){
-                objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum());
-            }
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){
-                objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName());
-            }
-            int count = iBusProcessNameService.count(objectQueryWrapper);
-            TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery();
-            taskCommonQueryInfo.setPrcType("25");
-            //标识 如果是技术标准搜索，则无需进入 制修订的方法
-            taskCommonQueryInfo.setTag(false);
-            taskCommonQueryInfo.setSize(count);
-            taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName());
-            taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id());
-            taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId());
-            taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent());
-            taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime());
-            taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime());
-            taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime());
-            taskCommonQueryInfo.setName(taskCommonQuery.getName());
-            taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName());
-            taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId());
-            taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum());
-            taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState());
-            taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime());
-            taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList());
-            taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId());
-
-
-            List<BusProcessName> busProcessNames = todoTaskListByUserId(taskCommonQueryInfo);
-            List<BusProcessName> listName = new ArrayList<>();
-            if(!todoList.isEmpty()){
-                for (BusProcessName nameData:todoList){
-                    listName.add(nameData);
-                }
-            }
-            if(!busProcessNames.isEmpty()){
-                for (BusProcessName nameData : busProcessNames){
-                    if(nameData.getTaskInfo().equals("技术标准起草")){
-                        listName.add(nameData);
-                    }
-                }
-                listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
-                todoList.clear();
-                //page.setCount(pageInfo.getCount()+page.getCount());
-                for (int i = 0; i <listName.size() ; i++) {
-                    //if(taskCommonQuery.getSize()>i){
-                        todoList.add(listName.get(i));
-                    //}
-                }
-            }
-        }
-        if(taskCommonQuery.getPrcType().equals("25") && taskCommonQuery.getTag()){
-            QueryWrapper<BusProcessName> objectQueryWrapper = new QueryWrapper<>();
-            objectQueryWrapper.eq("PRC_TYPE",25);
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){
-                objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum());
-            }
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){
-                objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName());
-            }
-            int count = iBusProcessNameService.count(objectQueryWrapper);
-            TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery();
-            taskCommonQueryInfo.setPrcType("25");
-            taskCommonQueryInfo.setTag(false);
-            taskCommonQueryInfo.setSize(count);
-            taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName());
-            taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id());
-            taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId());
-            taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent());
-            taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime());
-            taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime());
-            taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime());
-            taskCommonQueryInfo.setName(taskCommonQuery.getName());
-            taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName());
-            taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId());
-            taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum());
-            taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState());
-            taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime());
-            taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList());
-            taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId());
-
-
-            List<BusProcessName> busProcessNames = todoTaskListByUserId(taskCommonQueryInfo);
-            List<BusProcessName> listName = new ArrayList<>();
-
-            if(!busProcessNames.isEmpty()){
-                for (BusProcessName nameData : busProcessNames){
-                    if(!nameData.getTaskInfo().equals("技术标准起草")){
-                        listName.add(nameData);
-                    }
-                }
-                listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
-                todoList.clear();
-                //page.setCount(pageInfo.getCount()+page.getCount());
-                for (int i = 0; i <listName.size() ; i++) {
-                    todoList.add(listName.get(i));
-                }
-            }
-        }
         todoList.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
         return todoList;
     }
@@ -2266,13 +2233,64 @@ public class TodoTaskController extends BaseAction {
         if (taskCommonQuery.getPrcName() != null && !taskCommonQuery.getPrcName().equals("")) {
             queryWrapper.like("PRC_NAME", taskCommonQuery.getPrcName());
         }
+//        if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
+//            queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+//        }
         if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
-            queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+            if(taskCommonQuery.getPrcType().equals("buss1")){
+                //技术制修订
+                String prcType = taskCommonQuery.getPrcType()+","+25;
+                String[] split = prcType.split(",");
+                queryWrapper.in("PRC_TYPE", split);
+            }else {
+                queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+            }
         }
         queryWrapper.orderByDesc("CREAT_TIME");
         queryWrapper.isNotNull("PRC_ID");
         queryWrapper.isNotNull("PRC_NUM");
-        List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
+        //List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
+        List<BusProcessName> busProcessNames = iBusProcessNameService.list(queryWrapper);
+        //判断是否是25 如果是25 则进行数据纠正 只有是起草页面的
+        List<BusProcessName> list = new ArrayList<>();
+        if(taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")){
+            if(taskCommonQuery.getPrcType().equals("buss1")){
+                for (BusProcessName data:busProcessNames){
+                    HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
+                            .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
+                    List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
+                    if(StringUtils.isNotBlank(data.getPrcType())) {
+                        if (data.getPrcType().equals("buss1")) {
+                            list.add(data);
+                        }
+                        if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) {
+                            if (historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) {
+                                list.add(data);
+                            }
+                        }
+                    }
+                }
+            } else if(taskCommonQuery.getPrcType().equals("25")){
+                for (BusProcessName data:busProcessNames){
+                    HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
+                            .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
+                    List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
+                    if(StringUtils.isNotBlank(data.getPrcType())) {
+                        if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) {
+                            if (!historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) {
+                                list.add(data);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if(list.isEmpty()){
+            for (BusProcessName data:busProcessNames){
+                list.add(data);
+            }
+        }
+
         Page page = new Page();
         if (list != null && list.size() > 0) {
             List<BusProcessName> list1 = this.startPage(list, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
@@ -2375,105 +2393,6 @@ public class TodoTaskController extends BaseAction {
             page.setPageSize(taskCommonQuery.getSize());
             page.setPageNo(taskCommonQuery.getCurrent());
         }
-        if(taskCommonQuery.getPrcType().equals("buss1") && taskCommonQuery.getTag()){
-            QueryWrapper<BusProcessName> objectQueryWrapper = new QueryWrapper<>();
-            objectQueryWrapper.eq("PRC_TYPE",25);
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){
-                objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum());
-            }
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){
-                objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName());
-            }
-            int count = iBusProcessNameService.count(objectQueryWrapper);
-            TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery();
-            taskCommonQueryInfo.setPrcType("25");
-            taskCommonQueryInfo.setTag(false);
-            taskCommonQueryInfo.setSize(count);
-            taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName());
-            taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id());
-            taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId());
-            taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent());
-            taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime());
-            taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime());
-            taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime());
-            taskCommonQueryInfo.setName(taskCommonQuery.getName());
-            taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName());
-            taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId());
-            taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum());
-            taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState());
-            taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime());
-            taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList());
-            taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId());
-            Page pageInfo = IssuedProcess(taskCommonQueryInfo);
-            List<BusProcessName> listName = new ArrayList<>();
-            if(!page.getList().isEmpty()){
-                for (BusProcessName nameData: page.getList()){
-                    listName.add(nameData);
-                }
-            }
-            if(!pageInfo.getList().isEmpty()){
-                for (BusProcessName nameData : pageInfo.getList()){
-                    if(nameData.getTaskInfo().equals("技术标准起草")){
-                        listName.add(nameData);
-                    }
-                }
-                listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
-                page.getList().clear();
-                page.setCount(Long.valueOf(listName.size()));
-                for (int i = 0; i <listName.size() ; i++) {
-                    if(page.getPageSize()>i){
-                        page.getList().add(listName.get(i));
-                    }
-                }
-            }
-        }
-        if(taskCommonQuery.getPrcType().equals("25") &&   taskCommonQuery.getTag()){
-            QueryWrapper<BusProcessName> objectQueryWrapper = new QueryWrapper<>();
-            objectQueryWrapper.eq("PRC_TYPE",25);
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){
-                objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum());
-            }
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){
-                objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName());
-            }
-            int count = iBusProcessNameService.count(objectQueryWrapper);
-            TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery();
-            taskCommonQueryInfo.setPrcType("25");
-            taskCommonQueryInfo.setTag(false);
-            taskCommonQueryInfo.setSize(count);
-            taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName());
-            taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id());
-            taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId());
-            taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent());
-            taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime());
-            taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime());
-            taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime());
-            taskCommonQueryInfo.setName(taskCommonQuery.getName());
-            taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName());
-            taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId());
-            taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum());
-            taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState());
-            taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime());
-            taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList());
-            taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId());
-            Page pageInfo = IssuedProcess(taskCommonQueryInfo);
-            List<BusProcessName> listName = new ArrayList<>();
-            if(!pageInfo.getList().isEmpty()){
-                for (BusProcessName nameData : pageInfo.getList()){
-                    if(!nameData.getTaskInfo().equals("技术标准起草")){
-                        listName.add(nameData);
-                    }
-                }
-                listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
-                page.getList().clear();
-                page.setCount(Long.valueOf(listName.size()));
-                for (int i = 0; i <listName.size() ; i++) {
-                    if(page.getPageSize()>i){
-                        page.getList().add(listName.get(i));
-                    }
-                }
-            }
-        }
         page.getList().sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
         return page;
     }
@@ -2509,10 +2428,60 @@ public class TodoTaskController extends BaseAction {
             if (taskCommonQuery.getPrcName() != null && !taskCommonQuery.getPrcName().equals("")) {
                 queryWrapper.like("PRC_NAME", taskCommonQuery.getPrcName());
             }
+//            if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
+//                queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+//            }
             if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
-                queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+                if(taskCommonQuery.getPrcType().equals("buss1")){
+                      //技术制修订
+                    String prcType = taskCommonQuery.getPrcType()+","+25;
+                    String[] split = prcType.split(",");
+                    queryWrapper.in("PRC_TYPE", split);
+                }else {
+                    queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+                }
             }
-            List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
+            List<BusProcessName> busProcessNames = iBusProcessNameService.list(queryWrapper);
+            //判断是否是25 如果是25 则进行数据纠正 只有是起草页面的
+            List<BusProcessName> list = new ArrayList<>();
+            if(taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")){
+                if(taskCommonQuery.getPrcType().equals("buss1")){
+                    for (BusProcessName data:busProcessNames){
+                        HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
+                                .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
+                        List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
+                        if(StringUtils.isNotBlank(data.getPrcType())) {
+                            if (data.getPrcType().equals("buss1")) {
+                                list.add(data);
+                            }
+                            if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) {
+                                if (historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) {
+                                    list.add(data);
+                                }
+                            }
+                        }
+                    }
+                } else if(taskCommonQuery.getPrcType().equals("25")){
+                    for (BusProcessName data:busProcessNames){
+                        HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
+                                .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
+                        List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
+                        if(StringUtils.isNotBlank(data.getPrcType())) {
+                            if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) {
+                                if (!historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) {
+                                    list.add(data);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            if(list.isEmpty()){
+                for (BusProcessName data:busProcessNames){
+                    list.add(data);
+                    }
+            }
+
             List<BusProcessName> list1 = this.startPage(list, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
             if (list != null && list.size() > 0) {
                 for (BusProcessName busProcessName : list1) {
@@ -2620,109 +2589,6 @@ public class TodoTaskController extends BaseAction {
             page.setPageSize(taskCommonQuery.getSize());
             page.setPageNo(taskCommonQuery.getCurrent());
         }
-        if(taskCommonQuery.getPrcType().equals("buss1") && taskCommonQuery.getTag()){
-            QueryWrapper<BusProcessName> objectQueryWrapper = new QueryWrapper<>();
-            objectQueryWrapper.eq("PRC_TYPE",25);
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){
-                objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum());
-            }
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){
-                objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName());
-            }
-            int count = iBusProcessNameService.count(objectQueryWrapper);
-            TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery();
-            taskCommonQueryInfo.setPrcType("25");
-            taskCommonQueryInfo.setTag(false);
-            taskCommonQueryInfo.setSize(count);
-            taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName());
-            taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id());
-            taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId());
-            taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent());
-            taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime());
-            taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime());
-            taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime());
-            taskCommonQueryInfo.setName(taskCommonQuery.getName());
-            taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName());
-            taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId());
-            taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum());
-            taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState());
-            taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime());
-            taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList());
-            taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId());
-
-
-            Page pageInfo = doneProcess(taskCommonQueryInfo);
-            List<BusProcessName> listName = new ArrayList<>();
-            if(!page.getList().isEmpty()){
-                for (BusProcessName nameData: page.getList()){
-                    listName.add(nameData);
-                }
-            }
-            if(!pageInfo.getList().isEmpty()){
-                for (BusProcessName nameData : pageInfo.getList()){
-                    if(nameData.getTaskInfo().equals("技术标准起草")){
-                        listName.add(nameData);
-                    }
-                }
-                listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
-                page.getList().clear();
-                page.setCount(Long.valueOf(listName.size()));
-                for (int i = 0; i <listName.size() ; i++) {
-                    if(page.getPageSize()>i){
-                        page.getList().add(listName.get(i));
-                    }
-                }
-            }
-        }
-        if(taskCommonQuery.getPrcType().equals("25") && taskCommonQuery.getTag()){
-            QueryWrapper<BusProcessName> objectQueryWrapper = new QueryWrapper<>();
-            objectQueryWrapper.eq("PRC_TYPE",25);
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){
-                objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum());
-            }
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){
-                objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName());
-            }
-            int count = iBusProcessNameService.count(objectQueryWrapper);
-            TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery();
-            taskCommonQueryInfo.setPrcType("25");
-            taskCommonQueryInfo.setTag(false);
-            taskCommonQueryInfo.setSize(count);
-            taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName());
-            taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id());
-            taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId());
-            taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent());
-            taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime());
-            taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime());
-            taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime());
-            taskCommonQueryInfo.setName(taskCommonQuery.getName());
-            taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName());
-            taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId());
-            taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum());
-            taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState());
-            taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime());
-            taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList());
-            taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId());
-
-
-            Page pageInfo = doneProcess(taskCommonQueryInfo);
-            List<BusProcessName> listName = new ArrayList<>();
-            if(!pageInfo.getList().isEmpty()){
-                for (BusProcessName nameData : pageInfo.getList()){
-                    if(!nameData.getTaskInfo().equals("技术标准起草")){
-                        listName.add(nameData);
-                    }
-                }
-                listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
-                page.getList().clear();
-                page.setCount(Long.valueOf(listName.size()));
-                for (int i = 0; i <listName.size() ; i++) {
-                    if(page.getPageSize()>i){
-                        page.getList().add(listName.get(i));
-                    }
-                }
-            }
-        }
         page.getList().sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
         return page;
     }
@@ -2738,12 +2604,62 @@ public class TodoTaskController extends BaseAction {
         if (taskCommonQuery.getPrcName() != null && !taskCommonQuery.getPrcName().equals("")) {
             queryWrapper.like("PRC_NAME", taskCommonQuery.getPrcName());
         }
+//        if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
+//            queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+//        }
         if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
-            queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+            if(taskCommonQuery.getPrcType().equals("buss1")){
+                //技术制修订
+                String prcType = taskCommonQuery.getPrcType()+","+25;
+                String[] split = prcType.split(",");
+                queryWrapper.in("PRC_TYPE", split);
+            }else {
+                queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
+            }
         }
         queryWrapper.isNotNull("PRC_ID");
         queryWrapper.isNotNull("PRC_NAME");
-        List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
+       // List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
+        List<BusProcessName> busProcessNames = iBusProcessNameService.list(queryWrapper);
+        //判断是否是25 如果是25 则进行数据纠正 只有是起草页面的
+        List<BusProcessName> list = new ArrayList<>();
+        if(taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")){
+            if(taskCommonQuery.getPrcType().equals("buss1")){
+                for (BusProcessName data:busProcessNames){
+                    HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
+                            .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
+                    List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
+                    if(StringUtils.isNotBlank(data.getPrcType())) {
+                        if (data.getPrcType().equals("buss1")) {
+                            list.add(data);
+                        }
+                        if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) {
+                            if (historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) {
+                                list.add(data);
+                            }
+                        }
+                    }
+                }
+            } else if(taskCommonQuery.getPrcType().equals("25")){
+                for (BusProcessName data:busProcessNames){
+                    HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
+                            .processInstanceId(data.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
+                    List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
+                    if(StringUtils.isNotBlank(data.getPrcType())) {
+                        if (data.getPrcType().equals("25") && historicTaskInstanceQueryList.size()>0) {
+                            if (!historicTaskInstanceQueryList.get(0).getName().equals("技术标准起草")) {
+                                list.add(data);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if(list.isEmpty()){
+            for (BusProcessName data:busProcessNames){
+                list.add(data);
+            }
+        }
         Page page = new Page();
         if (list != null && list.size() > 0) {
             List<BusProcessName> list1 = this.startPage(list, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
@@ -2823,106 +2739,6 @@ public class TodoTaskController extends BaseAction {
             page.setPageSize(taskCommonQuery.getSize());
             page.setPageNo(taskCommonQuery.getCurrent());
         }
-        if(taskCommonQuery.getPrcType().equals("buss1") && taskCommonQuery.getTag()){
-            QueryWrapper<BusProcessName> objectQueryWrapper = new QueryWrapper<>();
-            objectQueryWrapper.eq("PRC_TYPE",25);
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){
-                objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum());
-            }
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){
-                objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName());
-            }
-            int count = iBusProcessNameService.count(objectQueryWrapper);
-            TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery();
-            taskCommonQueryInfo.setPrcType("25");
-            taskCommonQueryInfo.setTag(false);
-            taskCommonQueryInfo.setSize(count);
-            taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName());
-            taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id());
-            taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId());
-            taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent());
-            taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime());
-            taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime());
-            taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime());
-            taskCommonQueryInfo.setName(taskCommonQuery.getName());
-            taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName());
-            taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId());
-            taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum());
-            taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState());
-            taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime());
-            taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList());
-            taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId());
-            Page pageInfo = allProcess(taskCommonQueryInfo);
-            List<BusProcessName> listName = new ArrayList<>();
-            if(!page.getList().isEmpty()){
-                for (BusProcessName nameData: page.getList()){
-                    listName.add(nameData);
-                }
-            }
-
-            if(!pageInfo.getList().isEmpty()){
-                for (BusProcessName nameData : pageInfo.getList()){
-                    if(nameData.getTaskInfo().equals("技术标准起草")){
-                        listName.add(nameData);
-                    }
-                }
-                listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
-                page.getList().clear();
-                page.setCount(Long.valueOf(listName.size()));
-                for (int i = 0; i <listName.size() ; i++) {
-                    if(page.getPageSize()>i){
-                        page.getList().add(listName.get(i));
-                    }
-                }
-            }
-        }
-        if(taskCommonQuery.getPrcType().equals("25") && taskCommonQuery.getTag()){
-            QueryWrapper<BusProcessName> objectQueryWrapper = new QueryWrapper<>();
-            objectQueryWrapper.eq("PRC_TYPE",25);
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcNum())){
-                objectQueryWrapper.eq("PRC_NUM",taskCommonQuery.getPrcNum());
-            }
-            if(StringUtils.isNotBlank(taskCommonQuery.getPrcName())){
-                objectQueryWrapper.like("PRC_NAME",taskCommonQuery.getPrcName());
-            }
-            int count = iBusProcessNameService.count(objectQueryWrapper);
-            TaskCommonQuery taskCommonQueryInfo = new TaskCommonQuery();
-            taskCommonQueryInfo.setPrcType("25");
-            taskCommonQueryInfo.setTag(false);
-            taskCommonQueryInfo.setSize(count);
-            taskCommonQueryInfo.setTaskName(taskCommonQuery.getTaskName());
-            taskCommonQueryInfo.setCategory_id(taskCommonQuery.getCategory_id());
-            taskCommonQueryInfo.setCreatuserId(taskCommonQuery.getCreatuserId());
-            taskCommonQueryInfo.setCurrent(taskCommonQuery.getCurrent());
-            taskCommonQueryInfo.setEndTime(taskCommonQuery.getEndTime());
-            taskCommonQueryInfo.setFinishEndTime(taskCommonQuery.getFinishEndTime());
-            taskCommonQueryInfo.setFinishStartTime(taskCommonQuery.getFinishStartTime());
-            taskCommonQueryInfo.setName(taskCommonQuery.getName());
-            taskCommonQueryInfo.setPrcName(taskCommonQuery.getPrcName());
-            taskCommonQueryInfo.setPrcNameOrId(taskCommonQuery.getPrcNameOrId());
-            taskCommonQueryInfo.setPrcNum(taskCommonQuery.getPrcNum());
-            taskCommonQueryInfo.setPrcState(taskCommonQuery.getPrcState());
-            taskCommonQueryInfo.setStartTime(taskCommonQuery.getStartTime());
-            taskCommonQueryInfo.setTaskList(taskCommonQuery.getTaskList());
-            taskCommonQueryInfo.setUserId(taskCommonQuery.getUserId());
-            Page pageInfo = allProcess(taskCommonQueryInfo);
-            List<BusProcessName> listName = new ArrayList<>();
-            if(!pageInfo.getList().isEmpty()){
-                for (BusProcessName nameData : pageInfo.getList()){
-                    if(!nameData.getTaskInfo().equals("技术标准起草")){
-                        listName.add(nameData);
-                    }
-                }
-                listName.sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
-                page.getList().clear();
-                page.setCount(Long.valueOf(listName.size()));
-                for (int i = 0; i <listName.size() ; i++) {
-                    if(page.getPageSize()>i){
-                        page.getList().add(listName.get(i));
-                    }
-                }
-            }
-        }
         page.getList().sort((m1,m2)-> m2.getCreatTime().compareTo(m1.getCreatTime()));
         return page;
     }