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 pageRes = new Page<>(page, pageSize); IPage userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); - if ("1".equals(sortKey)) { - Map map = iDicTypeEOService.getDicTypeListCode(); - List list = userIPage.getRecords(); - List> arr = (List>) 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 map = iDicTypeEOService.getDicTypeListCode(); + List list = userIPage.getRecords(); + List> arr = (List>) 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 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 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 map1 : arr) { - if (map1.get("value").equals(list1.getCountryArea())) { - list1.setCountryArea(map1.get("value")); - break; - } - } } + userIPage.setRecords(list); } - userIPage.setRecords(list); + List names = new ArrayList<>(); + userIPage.getRecords().forEach(sarLawsDetailedList -> { + names.add(sarLawsDetailedList.getUpdatePeople()); + }); + List upDTOS = iTsUserService.selectNameById(names, "0"); + Map 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 names = new ArrayList<>(); - userIPage.getRecords().forEach(sarLawsDetailedList -> { - names.add(sarLawsDetailedList.getUpdatePeople()); - }); - List upDTOS = iTsUserService.selectNameById(names, "0"); - Map 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;