shudonghui vor 1 Jahr
Ursprung
Commit
f05db79bc2

+ 2 - 0
sop-business/src/main/java/com/qmth/sop/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -291,7 +291,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 dto.setStatus(e.getStatus() ? "已阅" : "未阅");
                 dto.setSupplier(e.getSupplier());
                 //时间戳转化为日期字符串
+                if(Objects.nonNull(e.getReceiveTime()))
                 dto.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(e.getReceiveTime()));
+                if(Objects.nonNull(e.getType()))
                 dto.setType(e.getType().getTitle());
                 return dto;
             }).collect(Collectors.toList());

+ 2 - 1
sop-business/src/main/resources/mapper/SysMessageMapper.xml

@@ -13,7 +13,8 @@
         s.NAME supplier,
         bs.NAME service,
         c.NAME custom,
-        c.type
+        c.type,
+        m.status
         FROM
         sys_message m
         LEFT JOIN sys_user u ON u.id = m.receive_user_id