From fdd7fe18c04c985b7f766c2e804a670b4910a3d3 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 31 Aug 2021 10:29:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarLawsDetailedListServiceImpl.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
index a975f767..c5939bdb 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
@@ -292,8 +292,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
 
     @Override
     public IPage<SarLawsDetailedList> AllSelectD(Integer page, Integer pageSize, String sortKey,
-                                                 String countryArea, String projectName, String carType,
-                                                 String detailedList, String detailedListName) {
+                                                 String countryArea, String projectName,
+                                                 String detailedList, String detailedListName,String carType) {
         QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
         if ("1".equals(sortKey)) {
             wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea).

From 1ef143e71f98bf35f1a07fe40db41e6a461aec10 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 31 Aug 2021 10:49:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7/=E6=A0=87=E5=87=86=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D=20=EF=BC=81=EF=BC=81=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index f75adaa6..d280e916 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -64,7 +64,7 @@
 
 
     <select id="selectLawsId" resultType="string">
-        select stand_id from sar_laws_attr_detailed_list
+        select distinct stand_id from sar_laws_attr_detailed_list
         LEFT JOIN sar_standards_info si ON sar_laws_attr_detailed_list.stand_id = si.ID
         <where>
             <if test="standId != null">
@@ -78,6 +78,7 @@
             </if>
             <if test="sar.standNumber != null">
                 and concat(concat(concat(concat(si.STAND_SORT,' '),si.STAND_NUMBER),'-'),si.STAND_YEAR) like concat(concat('%', #{sar.standNumber}),'%')
+                or si.STAND_NAME like concat(concat('%', #{sar.standNumber}),'%')
             </if>
             <if test="sar.standName != null">
                 and si.STAND_NAME like concat(concat('%', #{sar.standName}),'%')