From e5d7a6730744a81ee25372afe0b176eb864b6a4f Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Tue, 19 Jul 2022 11:11:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=A5=E5=BA=93=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=B8=85=E7=90=86=E9=9D=9E=E6=9C=AC=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=86=85=E7=9A=84=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ActSarItemsEOService.java         | 24 +++++++++----------
 .../impl/SarStandardsInfoServiceImpl.java     |  5 +---
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
index a279368a..518000ac 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
@@ -176,13 +176,13 @@ public class ActSarItemsEOService {
             }
             String standFoUser = "";
             List<Map<String,Object>> itemData = new ArrayList<>();
-            if (breakVal != null) {
-                //取出taskbreak中的部分标准信息放到map中，如fo,svpps,责任部门，项目评估角色
-                String valueStr = String.valueOf(breakVal);
-                jsonArray = JSONArray.parseArray(valueStr,String.class);
-                // 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO
-                handleStandCollectData(attInfoMap,jsonArray,itemData);
-            }
+//            if (breakVal != null) {
+//                //取出taskbreak中的部分标准信息放到map中，如fo,svpps,责任部门，项目评估角色
+//                String valueStr = String.valueOf(breakVal);
+//                jsonArray = JSONArray.parseArray(valueStr,String.class);
+//                // 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO
+//                handleStandCollectData(attInfoMap,jsonArray,itemData);
+//            }
             //处理文件
             //此处需要处理之前的文件信息，防止文件丢失
 //            attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
@@ -273,12 +273,12 @@ public class ActSarItemsEOService {
                 // 编辑相关流程
                 sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",prcNum);
             }
-            List<SarStandItems> allItems = new ArrayList<>();
+//            List<SarStandItems> allItems = new ArrayList<>();
             //开始处理条款数据，从去重后的结果中直接处理即可
-            if(itemData!=null && !itemData.isEmpty()){
-                // allItems =
-                saveStandItemsData(itemData, sarStandardsInfoEO);
-            }
+//            if(itemData!=null && !itemData.isEmpty()){
+//                // allItems =
+//                saveStandItemsData(itemData, sarStandardsInfoEO);
+//            }
             //技术评估结果入库  重构技术评估结果入库内容
 //            if ("0".equals(isJudge)) {
 //                saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum);
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 f2c1a0fc..23de453a 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
@@ -1935,17 +1935,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
 
         if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuIds())) {
-
             for (String menuId : sarStandardsInfoEO.getMenuIds().split(",")) {
                 SarStandardsInfoEOPage standardsInfoEO = new SarStandardsInfoEOPage();
                 standardsInfoEO.setMenuId(menuId);
                 standardsInfoEO.setIdlist(new String[]{sarStandardsInfoEO.getId()});
-
-
                 try {
                     updateStandardsMenu(standardsInfoEO);
                 } catch (NullPointerException e) {
-                    updateStandInfo(standardsInfoEO);
+                    logger.error(e.getMessage(),e);
                 }
             }
         }