From 7f2d7b6454d39dd6695a1eea17ef4baac01996d6 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 6 Jan 2022 14:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E5=AF=BC=E8=87=B4=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=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

---
 .../impl/SarLawsDetailedListServiceImpl.java  | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 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 2d8b6f97..94dab8b3 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
@@ -318,53 +318,55 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         wrapper.eq("sort_key", sortKey);
         Page<SarLawsDetailedList> pageRes = new Page<>(page, pageSize);
         IPage<SarLawsDetailedList> userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper);
-        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) {
+        if ( userIPage.getRecords().size()>0){
+            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("value");
+                                    builder.append(s + ",");
+                                    break;
+                                }
+                            }
+                        }
+                        String completedString = "";
+                        if (builder.length() > 0) {
+                            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("value");
-                                builder.append(s + ",");
+                            if (map1.get("value").equals(list1.getCountryArea())) {
+                                list1.setCountryArea(map1.get("value"));
                                 break;
                             }
                         }
                     }
-                    String completedString = "";
-                    if (builder.length() > 0) {
-                        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("value"));
-                            break;
-                        }
-                    }
                 }
+                userIPage.setRecords(list);
             }
-            userIPage.setRecords(list);
+            List<String> names = new ArrayList<>();
+            userIPage.getRecords().forEach(sarLawsDetailedList -> {
+                names.add(sarLawsDetailedList.getUpdatePeople());
+            });
+            List<UpDTO> upDTOS = iTsUserService.selectNameById(names, "0");
+            Map<String, String> stringMap = new HashMap<>();
+            upDTOS.forEach(upDTO -> {
+                stringMap.put(upDTO.getId(), upDTO.getValue());
+            });
+            userIPage.getRecords().forEach(sarLawsDetailedList -> {
+                if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) {
+                    sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople()));
+                }
+            });
         }
-        List<String> names = new ArrayList<>();
-        userIPage.getRecords().forEach(sarLawsDetailedList -> {
-            names.add(sarLawsDetailedList.getUpdatePeople());
-        });
-        List<UpDTO> upDTOS = iTsUserService.selectNameById(names, "0");
-        Map<String, String> stringMap = new HashMap<>();
-        upDTOS.forEach(upDTO -> {
-            stringMap.put(upDTO.getId(), upDTO.getValue());
-        });
-        userIPage.getRecords().forEach(sarLawsDetailedList -> {
-            if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) {
-                sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople()));
-            }
-        });
         System.out.println("总条数" + userIPage.getTotal());
         System.out.println("总页数" + userIPage.getPages());
         return userIPage;