消息提醒状态显示修改

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/RectifyMsgController.java

@@ -129,15 +129,6 @@ public class RectifyMsgController extends BaseController {
 		Page page = new Page(current,size);
 		List<MsgNoticeDto> msgNoticeDtoList = new ArrayList<>();
 		msgNoticeDtoList.addAll(rectifyMsgServiceImpl.msgNotice(isRead));
-		if(isRead){
-			for(MsgNoticeDto msgNoticeDto:msgNoticeDtoList){
-				msgNoticeDto.setStatus("已读");
-			}
-		}else{
-			for(MsgNoticeDto msgNoticeDto:msgNoticeDtoList){
-				msgNoticeDto.setStatus("未读");
-			}
-		}
 		page.setRecords(msgNoticeDtoList);
 		page.setTotal(msgNoticeDtoList.size());
 		return ResponseHelper.buildResponse(page);
@@ -153,9 +144,10 @@ public class RectifyMsgController extends BaseController {
 		if(!ValidationUtil.isEmpty(msgNoticeDtoList)) {
 			for(MsgNoticeDto msgNoticeDto:msgNoticeDtoList){
 				msgNoticeDto.setStatus("已读");
-			}
-			if (!isRead) {
-				isRead = true;
+			}if(!ValidationUtil.isEmpty(isRead)) {
+				if (!isRead) {
+					isRead = true;
+				}
 			}
 		}
 		page.setRecords(msgNoticeDtoList);

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

@@ -92,6 +92,13 @@ public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,
                     msgNoticeDto.setType(form);
                     msgNoticeDto.setContent(context);
                 }
+                if(!ValidationUtil.isEmpty(installNoticeMsg.getIsRead())){
+                    if(installNoticeMsg.getIsRead()){
+                        msgNoticeDto.setStatus("已读");
+                    }else{
+                        msgNoticeDto.setStatus("未读");
+                    }
+                }
                 msgNoticeDto.setCreateDate(installNoticeMsg.getSendTime());
                 msgNoticeDto.setSequenceNbr(installNoticeMsg.getSequenceNbr());
                 msgNoticeDtoList.add(msgNoticeDto);
@@ -105,6 +112,13 @@ public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,
                     msgNoticeDto.setType(contents.substring(contents.indexOf('【') + 1, contents.indexOf("】")));
                     msgNoticeDto.setContent(contents.substring(contents.indexOf("】") + 1));
                 }
+                if(!ValidationUtil.isEmpty(rectifyMsg.getIsRead())){
+                    if(rectifyMsg.getIsRead()){
+                        msgNoticeDto.setStatus("已读");
+                    }else{
+                        msgNoticeDto.setStatus("未读");
+                    }
+                }
                 msgNoticeDto.setCreateDate(rectifyMsg.getSendTime());
                 msgNoticeDto.setSequenceNbr(rectifyMsg.getSequenceNbr());
                 msgNoticeDtoList.add(msgNoticeDto);