diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java index a3e7a1bd..201c6f17 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java @@ -202,9 +202,15 @@ public class ProjectService implements IProjectService { //获取ring消息未读数量 Integer ringUnread = sysRingMsgDao.getRingUnreadNum(userId,projectId); ProjectVo.ProjectUnreadMsg unreadMsg = new ProjectVo.ProjectUnreadMsg(); - unreadMsg.setRingNum(ringUnread); + if(ObjectUtil.isNotNull(ringUnread)){ + unreadMsg.setRingNum(ringUnread); + }else { + unreadMsg.setRingNum(0); + } //TODO 获取check未读消息 + unreadMsg.setCheckNum(0); //TODO 获取未读交付物的消息 + unreadMsg.setDeliverNum(0); return unreadMsg; } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b2acd365..c88e995d 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common