diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
index 677f46ea..73d35ca2 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
@@ -85,9 +85,12 @@ public interface workFlowFeignClient {
     @RequestMapping(value = "/bat-wkflow/hastodoTasksList",method = RequestMethod.POST)
     Wrapper<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
 
-    @RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST)
+    @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST)
     List<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
 
+    @RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST)
+    List<BusProcessName> todoTaskListByUserIdInfo(@RequestBody TaskCommonQuery taskCommonQuery);
+
     @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST)
     List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery);
 
diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
index 79652be7..1472afb6 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
@@ -473,4 +473,9 @@ public class workFlowFeignClientImpl {
     public String endPrcName(String prcName,String esId) {
         return workFlowFeignClient.endPrcName(prcName,esId);
     }
+
+    public List<BusProcessName> todoTaskListByUserIdInfo(TaskCommonQuery taskCommonQuery) {
+        List<BusProcessName> mapWrapper = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery);
+        return  mapWrapper;
+    }
 }
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
index d686b676..eadaa447 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
@@ -532,7 +532,7 @@ public class WorkFlowController extends BaseController {
     @ApiOperation(value = "我的待办任务列表")
     @PostMapping("/todoTaskList")
     public PageInfo<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) {
-        List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
+        List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery);
         List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
         PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
         if (busProcessNames != null) {
@@ -1354,7 +1354,9 @@ public class WorkFlowController extends BaseController {
               String  prcName2 = bussSort2 + "-" + esName2 + "-计划立项";
                 String s1 = workFlowFeignClient.endPrcName(prcName1, esId1);
                 String s2 = workFlowFeignClient.endPrcName(prcName2, esId2);
-                if(s1.equals("成功") && s2.equals("成功")){
+                String[] split1 = s1.split("-");
+                String[] split2 = s2.split("-");
+                if(split1[0].equals("成功") && split2[0].equals("成功")){
                     return Result.success();
                 }else {
                     return Result.error();
@@ -1362,12 +1364,23 @@ public class WorkFlowController extends BaseController {
             }
         }else {
             s = workFlowFeignClient.endPrcName(prcName, esId);
-            Map<String, String> objectObjectMap = new HashMap<>();
-            objectObjectMap.put("ids",esId);
-            objectObjectMap.put("prcCreateUser","xxx");
-            String s1 = JSONObject.toJSONString(objectObjectMap);
-            if(s.equals("成功")){
-                return Result.success(s1);
+            String[] split = s.split("-");
+             List<String> asList = Arrays.asList(split);
+            if(split[0].equals("成功")){
+                if(asList.size()>1){
+                    EndPrcName endPrcName = new EndPrcName();
+                    Map<String, String> objectObjectMap = new HashMap<>();
+                    objectObjectMap.put("ids",split[1]);
+                    objectObjectMap.put("prcCreateUser","xxx");
+                    String s1 = JSONObject.toJSONString(objectObjectMap);
+                    endPrcName.setIds(s1);
+                    endPrcName.setIsNot("1");
+                    return Result.success(endPrcName);
+                }
+                EndPrcName endPrcName = new EndPrcName();
+                endPrcName.setIsNot("2");
+                endPrcName.setIds("xxx");
+                return Result.success(endPrcName);
             }else {
                 return Result.error();
             }
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/EndPrcName.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/EndPrcName.java
new file mode 100644
index 00000000..363d6b3c
--- /dev/null
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/EndPrcName.java
@@ -0,0 +1,9 @@
+package com.adc.da.workFlow.entity;
+
+import lombok.Data;
+
+@Data
+public class EndPrcName {
+    private String ids;
+    private String isNot;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 717910ce..8bd79183 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -3194,21 +3194,21 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     int size = sarStandMenuEODao.insert(sarStandMenuEO);
                 }
             }
-//            if (getInfo == null || getInfo.isEmpty()) {
-//                sarStandMenuEO.setId(UUIDUtils.randomUUID20());
-//                int size = sarStandMenuEODao.insert(sarStandMenuEO);
-////                if (size>0){
-////                    return true;
-////                }
-//            } else {
-//                sarStandMenuEO.setOldMenuId(secondLevelId);
-//                List<String> menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId);
-//                sarStandMenuEO.setMenuIds(menuOldIds);
-//                int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
-////                if (size>0) {
-////                    return true;
-////                }
-//            }
+            if (getInfo == null || getInfo.isEmpty()) {
+                sarStandMenuEO.setId(UUIDUtils.randomUUID20());
+                int size = sarStandMenuEODao.insert(sarStandMenuEO);
+                if (size>0){
+                    return true;
+                }
+            } else {
+                sarStandMenuEO.setOldMenuId(secondLevelId);
+                List<String> menuOldIdsInfo = sarMenuEOService.getChildMenuList(secondLevelId);
+                sarStandMenuEO.setMenuIds(menuOldIdsInfo);
+                int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
+                if (size>0) {
+                    return true;
+                }
+            }
         }
         return true;
     }