修改BUG

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;
     /**
      * 用户信息
      */

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<ItemDao, ItemEntity> implem
     @Override
     public PageData<ItemPendingHandleDTO> listOfItemsForPCEnd(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RuntimeException("获取用户信息失败");
+        }
         //部门ID列表
-        List<Long> deptIdList = user.getDeptIdList();
+        List<Long> 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);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml

@@ -37,6 +37,7 @@
         <result property="opposeNum" column="UN_LIKE_COUNT"/>
         <result property="userLike" column="userLike"/>
         <result property="userDislike" column="userDislike"/>
+        <result property="attitudeNum" column="attitudeNum"/>
         <result property="replyComment.userName" column="replyUserName"/>
         <result property="replyComment.content" column="replyContent"/>
     </resultMap>
@@ -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
+            <if test="orderType == '1'">
+                attitudeNum DESC,
+            </if>
             t2.CREATED_TIME DESC
     </select>
 
@@ -155,18 +160,16 @@
 
     <select id="selectOneHotComment" resultType="com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO">
         SELECT
-            comm.ID as commentId,
-            comm.content,
-            SUM( commua.ATTITUDE_FLAG = '0' ) AS oppositionNum,
-            SUM( commua.ATTITUDE_FLAG = '1' ) AS supportNum,
-            SUM( commua.ATTITUDE_FLAG = '0' ) + SUM( commua.ATTITUDE_FLAG = '1' ) AS statementNum
+            ID AS commentId,
+            content,
+            UN_LIKE_COUNT AS oppositionNum,
+            LIKE_COUNT AS supportNum,
+            ( UN_LIKE_COUNT + LIKE_COUNT + REPLY_COUNT ) AS statementNum
         FROM
-            epdc_event_comment comm
-            LEFT JOIN epdc_event_comment_user_attitude commua ON comm.ID = commua.EVENT_COMMENT_ID
-            AND commua.DEL_FLAG = '0'
+            epdc_event_comment
         WHERE
-            comm.DEL_FLAG = '0'
-            AND comm.EVENT_ID = #{eventId}
+            DEL_FLAG = '0'
+            AND EVENT_ID = #{eventId}
         ORDER BY
             statementNum DESC
             LIMIT 1