From 1f57316d3e2e66e721bc3a8142f746a09370b271 Mon Sep 17 00:00:00 2001
From: zzy <2041873787@qq.com>
Date: Fri, 23 Jul 2021 15:56:56 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarLawsDetailedListServiceImpl.java  | 99 +++++++++++--------
 1 file changed, 56 insertions(+), 43 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 af04df77..9a04b236 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
@@ -79,68 +79,82 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
             switch (addDetailedDto.getSortKey()) {
                 case "1":
                     sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea());
-                    if (addDetailedDto.getInforlist().contains(",")){
-                        String[] id = addDetailedDto.getInforlist().split(",");
-                        String[] putTime = addDetailedDto.getInforlist1().split(",");
-                        String[] zcc = addDetailedDto.getInforlist2().split(",");
-                        String[] xcx = addDetailedDto.getInforlist3().split(",");
-                        for (int a =0;a< id.length;a++){
+                    if (addDetailedDto.getInforlist()!=null){
+                        if (addDetailedDto.getInforlist().contains(",")){
+                            String[] id = addDetailedDto.getInforlist().split(",");
+                            String[] putTime = addDetailedDto.getInforlist1().split(",");
+                            String[] zcc = addDetailedDto.getInforlist2().split(",");
+                            String[] xcx = addDetailedDto.getInforlist3().split(",");
+                            for (int a =0;a< id.length;a++){
+                                TimeDto dto = new TimeDto();
+                                dto.setStandId(id[a]);
+                                if ("\"".equals(putTime[a])){
+                                    dto.setPutTime(null);
+                                }else {
+                                    dto.setPutTime(putTime[a]);
+                                }
+                                if ("\"".equals(putTime[a])){
+                                    dto.setXcxssrqgj(null);
+                                }else {
+                                    dto.setXcxssrqgj(xcx[a]);
+                                }
+                                if ("\"".equals(putTime[a])){
+                                    dto.setZccssrqgj(null);
+                                }else {
+                                    dto.setZccssrqgj(zcc[a]);
+                                }
+                                timeDto.add(dto);
+                            }
+                        }else {
                             TimeDto dto = new TimeDto();
-                            dto.setStandId(id[a]);
-                            if ("\"".equals(putTime[a])){
-                                dto.setPutTime(null);
-                            }else {
-                                dto.setPutTime(putTime[a]);
-                            }
-                            if ("\"".equals(putTime[a])){
-                                dto.setXcxssrqgj(null);
-                            }else {
-                                dto.setXcxssrqgj(xcx[a]);
-                            }
-                            if ("\"".equals(putTime[a])){
-                                dto.setZccssrqgj(null);
-                            }else {
-                                dto.setZccssrqgj(zcc[a]);
-                            }
+                            dto.setStandId(addDetailedDto.getInforlist());
+                            dto.setPutTime(addDetailedDto.getInforlist1());
+                            dto.setXcxssrqgj(addDetailedDto.getInforlist2());
+                            dto.setZccssrqgj(addDetailedDto.getInforlist3());
                             timeDto.add(dto);
                         }
                     }else {
-                        TimeDto dto = new TimeDto();
-                        dto.setStandId(addDetailedDto.getInforlist());
-                        dto.setPutTime(addDetailedDto.getInforlist1());
-                        dto.setXcxssrqgj(addDetailedDto.getInforlist2());
-                        dto.setZccssrqgj(addDetailedDto.getInforlist3());
-                        timeDto.add(dto);
+                        timeDto=null;
                     }
+
                     break;
                 case "2":
                     sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName());
-                    if (addDetailedDto.getInforlist().contains(",")){
-                        String[] id = addDetailedDto.getInforlist().split(",");
-                        for (String standId:id){
+                    if (addDetailedDto.getInforlist() != null){
+                        if (addDetailedDto.getInforlist().contains(",")){
+                            String[] id = addDetailedDto.getInforlist().split(",");
+                            for (String standId:id){
+                                TimeDto dto = new TimeDto();
+                                dto.setStandId(standId);
+                                timeDto.add(dto);
+                            }
+                        }else {
                             TimeDto dto = new TimeDto();
-                            dto.setStandId(standId);
+                            dto.setStandId(addDetailedDto.getInforlist());
                             timeDto.add(dto);
                         }
                     }else {
-                        TimeDto dto = new TimeDto();
-                        dto.setStandId(addDetailedDto.getInforlist());
-                        timeDto.add(dto);
+                        timeDto=null;
                     }
+
                     break;
                 case "3":
                     sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList());
-                    if (addDetailedDto.getInforlist().contains(",")){
-                        String[] id = addDetailedDto.getInforlist().split(",");
-                        for (String standId:id){
+                    if (addDetailedDto.getInforlist() != null){
+                        if (addDetailedDto.getInforlist().contains(",")){
+                            String[] id = addDetailedDto.getInforlist().split(",");
+                            for (String standId:id){
+                                TimeDto dto = new TimeDto();
+                                dto.setStandId(standId);
+                                timeDto.add(dto);
+                            }
+                        }else {
                             TimeDto dto = new TimeDto();
-                            dto.setStandId(standId);
+                            dto.setStandId(addDetailedDto.getInforlist());
                             timeDto.add(dto);
                         }
                     }else {
-                        TimeDto dto = new TimeDto();
-                        dto.setStandId(addDetailedDto.getInforlist());
-                        timeDto.add(dto);
+                        timeDto=null;
                     }
                     break;
                 default:
@@ -149,7 +163,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
             if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员");
             else {sarLawsDetailedList.setUpdatePeople(getUserName());}
             sarLawsDetailedListDao.insert(sarLawsDetailedList);
-            addDetailedDto.setInforlist(addDetailedDto.getInforlist().substring(1,addDetailedDto.getInforlist().length()-1));
             service.insertDetailedList(sarLawsDetailedList.getId(),timeDto);
 
         } catch (Exception e) {