From da22df97c7908fade9bd91afaf4d6f238eb3a7b8 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 29 Nov 2023 16:24:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   | 23 ++++++++++++-------
 .../SarLawsDetailedListController.java        |  6 ++++-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 5abfae37..ad9992d9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2628,7 +2628,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                      wrapper.eq(SarMenuStandard::getMenuName, txlbbuss);
                                                      List<SarMenuStandard> list = sarMenuStandardService.list(wrapper);
                                                      if (list.size() > 0) {
-                                                         sarBussStandAttrInfo.setTxlbbuss(list.get(0).getId());
+                                                         sarBussStandAttrInfo.setTxlbbuss(list.get(0).getMenuName());
                                                      }else {
                                                          return Result.error("第"+ count +"行请输入正确的标准体系");
                                                      }
@@ -4930,13 +4930,20 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         String sarStandAttrEOStr1 = sarBussionessStandEO.getSarStandAttrEOStr();
         if (sarStandAttrEOStr1 != null) {
             Map<String, String> attrInfoMap = JSON.parseObject(sarStandAttrEOStr1, Map.class);
-            if (StringUtils.isNotBlank(attrInfoMap.get("TXLBBUSS"))) {
-                SarBussStandMenu sarBussStandMenuEO = new SarBussStandMenu();
-                sarBussStandMenuEO.setBussStandId(sarBussionessStandEO.getId());
-                sarBussStandMenuEO.setMenuId(attrInfoMap.get("TXLBBUSS"));
-                sarBussStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
-                sarBussStandMenuEO.setId(UUIDUtils.randomUUID20());
-                sarBussStandMenuEODao.insert(sarBussStandMenuEO);
+            LambdaQueryWrapper<SarMenuStandard> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(SarMenuStandard::getMenuName, attrInfoMap.get("TXLBBUSS"));
+            queryWrapper.eq(SarMenuStandard::getValidFlag, "0");
+            queryWrapper.eq(SarMenuStandard::getDicId, "9m4qqqaansxmox5e82zm");
+            List<SarMenuStandard> list = sarMenuStandardService.list(queryWrapper);
+            if (list.size() > 0) {
+                if (StringUtils.isNotBlank(attrInfoMap.get("TXLBBUSS"))) {
+                    SarBussStandMenu sarBussStandMenuEO = new SarBussStandMenu();
+                    sarBussStandMenuEO.setBussStandId(sarBussionessStandEO.getId());
+                    sarBussStandMenuEO.setMenuId(list.get(0).getId());
+                    sarBussStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
+                    sarBussStandMenuEO.setId(UUIDUtils.randomUUID20());
+                    sarBussStandMenuEODao.insert(sarBussStandMenuEO);
+                }
             }
         }
         if (insertresult >= 1) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
index cc7a758e..2c86309e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
@@ -131,7 +131,11 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
                 }else if (null!=list.get(a).getFileIds()){
                     AttFileEO attFileEO = attFileEOController.getAttFileInfo(list.get(a).getFileIds()).getData();
                     FindFileNameDto fileNameDto = list1.get(a);
-                    fileNameDto.setFileName(attFileEO.getOldFileName());
+                    if (attFileEO==null){
+                        fileNameDto.setFileName("");
+                    } else {
+                        fileNameDto.setFileName(attFileEO.getOldFileName());
+                    }
                     list1.set(a,fileNameDto);
                 }
             }