diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 424f1e01..295494fc 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -536,10 +536,11 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl page = listOfPendingReviewEvents(new HashMap<>()); MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO(); menuNoticeDTO.setDeptId(deptId); - menuNoticeDTO.setNum(num); + menuNoticeDTO.setNum(page.getTotal()); menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_EVENT_RESPOND); // 发送菜单消息通知 newsTask.eventMenuNotice(menuNoticeDTO, userId); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index c65f23a9..157ad529 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -414,10 +414,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public void sendIssueHandleMenuNotice(Long deptId, Long userId) { // 获取部门待处理事件数量 - int num = baseDao.selectCountOfDeptNotice(deptId, EventIssueItemState.ISSUE_REVIEW_PASS); +// int num = baseDao.selectCountOfDeptNotice(deptId, EventIssueItemState.ISSUE_REVIEW_PASS); + PageData page = listOfIssues(new HashMap<>()); MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO(); menuNoticeDTO.setDeptId(deptId); - menuNoticeDTO.setNum(num); + menuNoticeDTO.setNum(page.getTotal()); menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_ISSUE_HANDLE); // 发送菜单消息通知 newsTask.eventMenuNotice(menuNoticeDTO, userId); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index a4154528..eb59faaa 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -988,10 +988,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public void sendItemHandleMenuNotice(Long deptId, Long userId) { // 获取部门待处理项目数量 - int num = baseDao.selectCountOfItemDeptNotice(deptId, EventIssueItemState.ITEM_HANDLING); +// int num = baseDao.selectCountOfItemDeptNotice(deptId, EventIssueItemState.ITEM_HANDLING); + PageData page = listOfItemsForPCEnd(new HashMap<>()); MenuNoticeDTO menuNoticeDTO = new MenuNoticeDTO(); menuNoticeDTO.setDeptId(deptId); - menuNoticeDTO.setNum(num); + menuNoticeDTO.setNum(page.getTotal()); menuNoticeDTO.setMenuCode(MenuCodeConstant.PARTY_GROUP_DISCUSSION_ITEM_HANDLE); // 发送菜单消息通知 newsTask.eventMenuNotice(menuNoticeDTO, userId);