From 8f53c85efc0c27b00512f20279170b8950f8207c Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 23 Aug 2021 11:04:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarLawsDetailedListController.java     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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 fb33ca82..4c0e3da5 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
@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -152,8 +153,14 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
     @PutMapping("/updateList")
     public ResponseMessage updateList(@RequestBody DetailedUpDto detailedUpDto) {
         String src = sarLawsDetailedListService.updateList(detailedUpDto);
-        return Result.success("200",src,true);
+        if (Objects.equals(src, "国家/地区清单修改失败") || Objects.equals(src, "车型类别清单修改失败")){
+            return Result.error("200","",false);
+        }else if (Objects.equals(src, "国家/地区清单修改成功") || Objects.equals(src, "车型类别清单修改成功")){
+            return Result.success("200","",true);
+        }else {
+            return Result.success("200","",true);
+        }
     }
 
 
-}
\ No newline at end of file
+}

From d94b03b05a663197808caf7eb023f4021520f876 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Mon, 23 Aug 2021 14:46:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E5=9B=9E=E6=98=BEbug(T=5FT)~~~~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
index bfce5e43..f67877f2 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -249,6 +249,6 @@
         )
     </select>
     <select id="getAllStands" resultType="java.lang.String">
-        SELECT DISTINCT STAND_ID FROM sar_stand_items
+        SELECT DISTINCT ID FROM sar_standards_info
     </select>
 </mapper>