Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/RectifyMsgServiceImpl.java

@@ -77,27 +77,31 @@ public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,
         List<InstallNoticeMsg> installNoticeMsgList = installNoticeMsgMapper.selectList(wrapper);
         List<MsgNoticeDto> msgNoticeDtoList = new ArrayList<>();
         MsgNoticeDto msgNoticeDto = new MsgNoticeDto();
-        for(InstallNoticeMsg installNoticeMsg : installNoticeMsgList){
-            String contents = installNoticeMsg.getContent();
-            if(!ValidationUtil.isEmpty(contents)){
-                String form = contents.substring(contents.indexOf('【')+1,contents.indexOf("】"));
-                String context = contents.substring(contents.indexOf("】")+1);
-                msgNoticeDto.setType(form);
-                msgNoticeDto.setContent(context);
+        if(!ValidationUtil.isEmpty(installNoticeMsgList)) {
+            for (InstallNoticeMsg installNoticeMsg : installNoticeMsgList) {
+                String contents = installNoticeMsg.getContent();
+                if (!ValidationUtil.isEmpty(contents)) {
+                    String form = contents.substring(contents.indexOf('【') + 1, contents.indexOf("】"));
+                    String context = contents.substring(contents.indexOf("】") + 1);
+                    msgNoticeDto.setType(form);
+                    msgNoticeDto.setContent(context);
+                }
+                msgNoticeDto.setCreateDate(installNoticeMsg.getSendTime());
+                msgNoticeDto.setSequenceNbr(installNoticeMsg.getSequenceNbr());
+                msgNoticeDtoList.add(msgNoticeDto);
             }
-            msgNoticeDto.setCreateDate(installNoticeMsg.getSendTime());
-            msgNoticeDto.setSequenceNbr(installNoticeMsg.getSequenceNbr());
-            msgNoticeDtoList.add(msgNoticeDto);
         }
-        for(RectifyMsg rectifyMsg : rectifyMsgList){
-            String contents = rectifyMsg.getContent();
-            if(!ValidationUtil.isEmpty(contents)){
-                msgNoticeDto.setType(contents.substring(contents.indexOf('【')+1,contents.indexOf("】")));
-                msgNoticeDto.setContent(contents.substring(contents.indexOf("】")+1));
+        if(!ValidationUtil.isEmpty(rectifyMsgList)) {
+            for (RectifyMsg rectifyMsg : rectifyMsgList) {
+                String contents = rectifyMsg.getContent();
+                if (!ValidationUtil.isEmpty(contents)) {
+                    msgNoticeDto.setType(contents.substring(contents.indexOf('【') + 1, contents.indexOf("】")));
+                    msgNoticeDto.setContent(contents.substring(contents.indexOf("】") + 1));
+                }
+                msgNoticeDto.setCreateDate(rectifyMsg.getSendTime());
+                msgNoticeDto.setSequenceNbr(rectifyMsg.getSequenceNbr());
+                msgNoticeDtoList.add(msgNoticeDto);
             }
-            msgNoticeDto.setCreateDate(rectifyMsg.getSendTime());
-            msgNoticeDto.setSequenceNbr(rectifyMsg.getSequenceNbr());
-            msgNoticeDtoList.add(msgNoticeDto);
         }
         return msgNoticeDtoList;
     }