From 1a816197f1751a839455a6fa284cc554cf0d5f92 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 27 Oct 2023 16:22:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94):=20=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsCustomCompareInfoServiceImpl.java     | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
index 88bb934a..60b6bb30 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
@@ -77,6 +77,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
     private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
     private final ISysDictService sysDictService;
     private final ISysDictItemService sysDictItemService;
+    public static final String STANDARD_NUMBER = "standard_number";
 
     public LawsCustomCompareInfoServiceImpl(LawsCustomCompareInfoMapper lawsCustomCompareInfoMapper,
                                             ILawsCustomCompareInfoStandardService lawsCustomCompareInfoStandardService,
@@ -136,7 +137,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
         // 标准编号/标准名称
         if (StringUtils.isNotBlank(standardVO.getStandardNumberOrName())){
             queryWrapper.and(qw -> qw
-                    .like("standard_number", standardVO.getStandardNumberOrName())
+                    .like(STANDARD_NUMBER, standardVO.getStandardNumberOrName())
                     .or()
                     .like("standard_name", standardVO.getStandardNumberOrName()));
         }
@@ -146,9 +147,9 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
         }
         if(StringUtils.isNotBlank(standardVO.getStandardNumbers())){
             List<String> list = Arrays.asList(standardVO.getStandardNumber().split(","));
-            queryWrapper.in("standard_number", list);
+            queryWrapper.in(STANDARD_NUMBER, list);
         }
-        queryWrapper.eq(StringUtils.isNotBlank(standardVO.getStandardNumber()), "standard_number", standardVO.getStandardNumber());
+        queryWrapper.eq(StringUtils.isNotBlank(standardVO.getStandardNumber()), STANDARD_NUMBER, standardVO.getStandardNumber());
         queryWrapper.eq(StringUtils.isNotBlank(standardVO.getStandardState()), "standard_state", standardVO.getStandardState());
         queryWrapper.apply(StringUtils.isNotBlank(standardVO.getReleaseDateBegin()),
                         "date_format (create_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", standardVO.getReleaseDateBegin())
@@ -277,11 +278,20 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
                 .findFirst();
 
         Optional<SysDictItem> compareItemDicItem = sysDictItemList.stream()
-                .filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_1.equals(v.getItemValue()))
+                .filter(v -> LawsCustomCompareCommon.INVENTORY_TYPE_2.equals(v.getItemValue()))
                 .findFirst();
 
-        featureDicItem.ifPresent(v -> map.put(v.getItemText(), feature));
-        compareItemDicItem.ifPresent(v -> map.put(v.getItemText(), compareItem));
+        if (featureDicItem.isPresent()){
+            map.put(featureDicItem.get().getItemText(), feature);
+        }else {
+            map.put("特点", new ArrayList<LawsCustomCompareInventory>());
+        }
+
+        if (compareItemDicItem.isPresent()){
+            map.put(compareItemDicItem.get().getItemText(), compareItem);
+        }else {
+            map.put("对比项", new ArrayList<LawsCustomCompareInventory>());
+        }
         return map;
     }