From 0c8df99fd23c74bf689ef14e10637f2a19d2dbae Mon Sep 17 00:00:00 2001
From: zzy <2041873787@qq.com>
Date: Thu, 8 Jul 2021 09:17:52 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarLawsDetailedListServiceImpl.java  | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 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 4e81e311..3919b41a 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
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 
+import static com.adc.da.login.util.UserUtils.getUserName;
 /**
  * <p>
  *  服务实现类
@@ -68,6 +69,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                     .updateTime(new Date())
                     .updatePeople(addDetailedDto.getUpdatePeople())
                     .remark(addDetailedDto.getRemark())
+                    .updatePeople(getUserName())
                     .build();
             switch (addDetailedDto.getSortKey()) {
                 case "1":
@@ -113,34 +115,36 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         wrapper.eq("sort_key",sortKey);
         Page<SarLawsDetailedList> page = new Page<>(pages, size);
         IPage<SarLawsDetailedList> userIPage = sarLawsDetailedListDao.selectPage(page, wrapper);
-        Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
-        List<SarLawsDetailedList> list= userIPage.getRecords();
-        List<Map<String, String>> arr = (List<Map<String, String>>)map.get("COUNTRY");
-        for (SarLawsDetailedList list1:list){
-            if (list1.getCountryArea().contains(",")){
-                String[] split = list1.getCountryArea().split(",");
-                StringBuilder builder = new StringBuilder();
-                for (String s:split){
+        if ("1".equals(sortKey)){
+            Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
+            List<SarLawsDetailedList> list= userIPage.getRecords();
+            List<Map<String, String>> arr = (List<Map<String, String>>)map.get("COUNTRY");
+            for (SarLawsDetailedList list1:list){
+                if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")){
+                    String[] split = list1.getCountryArea().split(",");
+                    StringBuilder builder = new StringBuilder();
+                     for (String s:split){
+                        for (Map<String,String> map1:arr) {
+                            if (map1.get("value").equals(s)){
+                                s=map1.get("label");
+                                builder.append(s+",");
+                                break;
+                            }
+                        }
+                    }
+                    String completedString = builder.delete(builder.length()-1,builder.length()).toString();
+                    list1.setCountryArea(completedString);
+                }else {
                     for (Map<String,String> map1:arr) {
-                        if (map1.get("value").equals(s)){
-                            s=map1.get("label");
-                            builder.append(s+",");
+                        if (map1.get("value").equals(list1.getCountryArea())){
+                            list1.setCountryArea(map1.get("label"));
                             break;
                         }
                     }
                 }
-                String completedString = builder.delete(builder.length()-1,builder.length()).toString();
-                list1.setCountryArea(completedString);
-            }else {
-                for (Map<String,String> map1:arr) {
-                    if (map1.get("value").equals(list1.getCountryArea())){
-                        list1.setCountryArea(map1.get("label"));
-                        break;
-                    }
-                }
             }
+            userIPage.setRecords(list);
         }
-        userIPage.setRecords(list);
         System.out.println("总条数" + userIPage.getTotal());
         System.out.println("总页数" + userIPage.getPages());
         return userIPage;