From 382f42b8e578cbe9a06c8af97664464a903ed289 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 14:39:06 +0800
Subject: [PATCH 1/2] feat: There is no way the,

---
 .../mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
index 6c9f406d..459621b6 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
@@ -95,7 +95,8 @@
                 and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%')
             </if>
             <if test="numberName != null and numberName != ''">
-                and (LAWS_NAME like concat(concat('%',#{numberName}),'%')
+                and (SAR_LAWS_STAND_INFO.LAWS_NAME like concat(concat('%',#{numberName}),'%')
+                or SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{numberName}),'%')
                 or SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{numberName}),'%'))
             </if>
              <if test="lawsName != null and lawsName != ''">

From 8b225fbb1415960cf31d96c72c8514c7f429fbba Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 17:01:48 +0800
Subject: [PATCH 2/2] feat: There is no way the,

---
 .../service/impl/SarStandardsInfoServiceImpl.java           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 c4a0878c..95671ab9 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
@@ -613,7 +613,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 tsUserQW.select("UNAME")
                                         .in("USID",valArr);
                                 List<String> stringList = tsUserService.listObjs(tsUserQW, o ->o.toString());
-                                value= String.join(",", stringList);
+                                value= String.join(",", stringList.isEmpty() ? valArr : stringList);
                                 break;
                             }
                             //通过id绑定责任部门师名称
@@ -622,14 +622,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 tsPositionQW.select("name")
                                         .in("id",valArr);
                                 List<String> stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString());
-                                value = String.join(",", stringList);
+                                value= String.join(",", stringList.isEmpty() ? valArr : stringList);
                                 break;
                             }
                             default:value = dicTypeEODao.getDicNamesByCodes(valArr);
                         }
 
 
-                        entry.setValue(value);
+                        entry.setValue(value == null ? String.join(",",valArr) : value);
                     }
                 }
             }