From 6e1a53e2a751bf6e9d66a00c718935ede1d3eb67 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 19 Sep 2019 20:40:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/events/EpdcEventsCommentsDTO.java | 4 +++ .../item/service/impl/ItemServiceImpl.java | 11 +++++++- .../mapper/comment/EventCommentDao.xml | 27 ++++++++++--------- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsCommentsDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsCommentsDTO.java index 8a804b845..e067def73 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsCommentsDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsCommentsDTO.java @@ -42,6 +42,10 @@ public class EpdcEventsCommentsDTO implements Serializable { * 踩数 */ private Integer opposeNum; + /** + * 表态次数 + */ + private Integer attitudeNum; /** * 用户信息 */ 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 3f4f9f405..71012fe09 100755 --- 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 @@ -103,8 +103,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public PageData listOfItemsForPCEnd(Map params) { UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RuntimeException("获取用户信息失败"); + } //部门ID列表 - List deptIdList = user.getDeptIdList(); + List deptIdList = new ArrayList<>(); + // 判断是否为网格,不为网格只能查看本部门下的项目数据 + if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) { + deptIdList = user.getDeptIdList(); + } else { + deptIdList.add(user.getDeptId()); + } params.put("deptIdList", null); if (null != deptIdList && deptIdList.size() > 0) { params.put("deptIdList", deptIdList); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml index 6b4eed115..ad9c8ef43 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml @@ -37,6 +37,7 @@ + @@ -55,7 +56,8 @@ t2.userDislike, t3.ID AS replyId, t3.USER_NAME AS replyUserName, - t3.CONTENT AS replyContent + t3.CONTENT AS replyContent, + t2.attitudeNum FROM ( SELECT @@ -102,6 +104,9 @@ ) t2 LEFT JOIN epdc_event_comment t3 ON t2.COMMENT_ID = t3.ID ORDER BY + + attitudeNum DESC, + t2.CREATED_TIME DESC @@ -155,21 +160,19 @@