From 93a2bbe591bcdb7730cd0d54149ede49f78929a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Wed, 27 Nov 2019 19:26:12 +0800
Subject: [PATCH] no message

---
 .../controller/ApiWorkIssueController.java    | 20 ++++++++++---------
 .../service/impl/EpdcEventsServiceImpl.java   |  8 ++++----
 .../issue/service/impl/IssueServiceImpl.java  |  6 +++---
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java
index 60ef0e36b..c32e820d9 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java
@@ -67,7 +67,6 @@ public class ApiWorkIssueController {
         return workIssueService.categoryList();
     }
 
-
     /**
      *事件审核
      * @return
@@ -88,6 +87,7 @@ public class ApiWorkIssueController {
         return workIssueService.selectWorkIssueListOfNewOrHot(formDto);
     }
 
+
     /**
      * 工作端-议题详情
      */
@@ -106,6 +106,15 @@ public class ApiWorkIssueController {
         return workIssueService.selectWorkHotOrNewEventComment(formDTO);
     }
 
+    /**
+     *
+     * 事件评论回复列表接口
+     */
+    @GetMapping("event/commentReplyList")
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){
+        return workIssueService.commentReplyList(workCommentReplyFormDTO);
+    }
+
     /**
      *
      * 议题处理进度(后台/工作端用)
@@ -124,12 +133,5 @@ public class ApiWorkIssueController {
         return workIssueService.handleSubmit(dto);
     }
 
-    /**
-     *
-     * 事件评论回复列表接口
-     */
-    @GetMapping("event/commentReplyList")
-    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){
-        return workIssueService.commentReplyList(workCommentReplyFormDTO);
-    }
+
 }
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 6d256aa46..6c66a873d 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
@@ -408,11 +408,11 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
     @Override
     public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) {
         List list;
-        if (formDto.getDeptId() == null){
-            list = SecurityUser.getUser().getDeptIdList();
-        }else {
-            list = new ArrayList();
+        if (formDto.getDeptId() > 0){
+            list = new ArrayList<>();
             list.add(formDto.getDeptId());
+        }else {
+            list = SecurityUser.getUser().getDeptIdList();
         }
         formDto.setDeptIdList(list);
         return baseDao.listIssuePendingResponse(formDto);
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 9d90c1f8f..65d97ff4f 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
@@ -411,11 +411,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Override
     public Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto) {
         List<Long> list;
-        if (formDto.getDeptId() == null){
-            list = SecurityUser.getUser().getDeptIdList();
-        }else {
+        if (formDto.getDeptId() > 0){
             list = new ArrayList<>();
             list.add(formDto.getDeptId());
+        }else {
+            list = SecurityUser.getUser().getDeptIdList();
         }
         Integer pendingHandleNum = baseDao.selectCountOfIssueState(list,0);
         Integer closed = baseDao.selectCountOfIssueState(list,2);