PC端、工作端事件和议题列表权限修改，增加工作人员事件关系表权限

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java

@@ -41,4 +41,9 @@ public class IssuePendingResponseFormDTO implements Serializable {
      */
     private String timestamp;
 
+    /**
+     * 工作人员ID
+     */
+    private Long workUserId;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java

@@ -47,6 +47,9 @@ public class WorkIssueListFormDTO implements Serializable {
      */
     private Integer issueState;
 
-
+    /**
+     * 工作人员ID
+     */
+    private Long workUserId;
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java

@@ -57,7 +57,6 @@ public class EpdcEventsController {
     private EpdcEventsService epdcEventsService;
 
     @GetMapping("page")
-    @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public Result<PageData<EpdcEventsDTO>> page(@RequestParam Map<String, Object> params){
         PageData<EpdcEventsDTO> page = epdcEventsService.listOfPendingReviewEvents(params);
 
@@ -155,7 +154,6 @@ public class EpdcEventsController {
      * @Date: 2019/9/6 15:11
      */
     @GetMapping("rejectEvents")
-    @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public Result<PageData<EpdcRejectEventsDTO>> rejectEvents(@RequestParam Map<String, Object> params){
         PageData<EpdcRejectEventsDTO> page = epdcEventsService.listOfRejectEvents(params);
         return new Result<PageData<EpdcRejectEventsDTO>>().ok(page);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -132,6 +132,14 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
 
     @Override
     public PageData<EpdcEventsDTO> listOfPendingReviewEvents(Map<String, Object> params) {
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RenException("当前登录状态已失效，请重新登录");
+        }
+        List<Long> deptIdList = user.getDeptIdList();
+        deptIdList.add(user.getDeptId());
+        params.put("deptIdList", deptIdList);
+        params.put("workUserId", user.getId());
         IPage<EpdcEventsDTO> page = getPage(params);
         List<EpdcEventsDTO> list = baseDao.selectListOfPendingReviewEvents(params);
         return new PageData<>(list, page.getTotal());
@@ -382,6 +390,14 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
 
     @Override
     public PageData<EpdcRejectEventsDTO> listOfRejectEvents(Map<String, Object> params) {
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RenException("当前登录状态已失效，请重新登录");
+        }
+        List<Long> deptIdList = user.getDeptIdList();
+        deptIdList.add(user.getDeptId());
+        params.put("deptIdList", deptIdList);
+        params.put("workUserId", user.getId());
         IPage<EpdcRejectEventsDTO> page = getPage(params);
         List<EpdcRejectEventsDTO> list = baseDao.selectListOfRejectEvents(params);
         return new PageData<>(list, page.getTotal());

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java

@@ -66,7 +66,6 @@ public class IssueController {
      * @Date: 2019/9/5 16:49
      */
     @GetMapping("page")
-    @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public Result<PageData<IssueWaitHandleOrClosedDTO>> waitHandlePage(@RequestParam Map<String, Object> params){
         PageData<IssueWaitHandleOrClosedDTO> page = issueService.listOfIssues(params);
         return new Result<PageData<IssueWaitHandleOrClosedDTO>>().ok(page);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -121,6 +121,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
     @Override
     public PageData<IssueWaitHandleOrClosedDTO> listOfIssues(Map<String, Object> params) {
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RenException("当前登录状态已失效，请重新登录");
+        }
+        List<Long> deptIdList = user.getDeptIdList();
+        deptIdList.add(user.getDeptId());
+        params.put("deptIdList", deptIdList);
+        params.put("workUserId", user.getId());
+
         IPage<IssueWaitHandleOrClosedDTO> page = getPage(params);
         if (null != params.get("issueCode")) {
             params.put("issueCode", params.get("issueCode").toString().trim());
@@ -484,6 +493,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) {
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
         formDto.setPageIndex(pageIndex);
+        formDto.setWorkUserId(SecurityUser.getUserId());
         return epdcEventsService.listIssuePendingResponse(formDto);
     }
 
@@ -504,6 +514,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             list = SecurityUser.getUser().getDeptIdList();
         }
         formDto.setDeptIdList(list);
+        formDto.setWorkUserId(SecurityUser.getUserId());
         List<WorkIssueListResultDTO> data = baseDao.selectWorkIssueListOfNewOrHot(formDto);
         // 查询最热评论
         for (WorkIssueListResultDTO dto : data) {

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

@@ -68,8 +68,15 @@
             temp.CREATED_TIME AS createdTime
         FROM
             epdc_events temp
+            LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = temp.ID AND u.DEL_FLAG = '0'
         WHERE
             temp.DEL_FLAG = '0'
+            AND (temp.GRID_ID IN
+            <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+            OR u.WORK_USER_ID = #{workUserId}
+            )
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </if>
@@ -97,8 +104,15 @@
             temp.EVENT_CONTENT AS eventContent
         FROM
             epdc_events temp
+            LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = temp.ID AND u.DEL_FLAG = '0'
         WHERE
             temp.DEL_FLAG = '0'
+            AND (temp.GRID_ID IN
+            <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+            OR u.WORK_USER_ID = #{workUserId}
+            )
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </if>
@@ -315,18 +329,21 @@
     </resultMap>
 
     <select id="listIssuePendingResponse" resultMap="pendingResponseMap">
-        SELECT ID,EVENT_CONTENT,NICK_NAME,CREATED_TIME,IS_PARTY_MEMBER,USER_FACE
-        FROM epdc_events
-        WHERE DEL_FLAG = '0'
-        AND GRID_ID IN
-        <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-        AND EVENT_STATE = #{state}
+        SELECT e.ID,e.EVENT_CONTENT,e.NICK_NAME,e.CREATED_TIME,e.IS_PARTY_MEMBER,e.USER_FACE
+        FROM epdc_events e
+        LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = e.ID AND u.DEL_FLAG = '0'
+        WHERE e.DEL_FLAG = '0'
+        AND (e.GRID_ID IN
+                <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+             OR u.WORK_USER_ID = #{workUserId}
+            )
+        AND e.EVENT_STATE = #{state}
         <if test="timestamp != null">
-            <![CDATA[ AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+            <![CDATA[ AND DATE_FORMAT(e.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
-        order by CREATED_TIME DESC
+        order by e.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -17,10 +17,17 @@
             issue.ISSUE_CODE
         FROM
             epdc_issue issue
+            LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = issue.EVENT_ID AND u.DEL_FLAG = '0'
             LEFT JOIN epdc_events e ON issue.EVENT_ID = e.ID
             AND e.DEL_FLAG = '0'
         WHERE
             issue.DEL_FLAG = '0'
+            AND (issue.GRID_ID IN
+            <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+            OR u.WORK_USER_ID = #{workUserId}
+            )
             and issue.ISSUE_STATE = #{state}
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
@@ -539,15 +546,18 @@
                 t1.id
                 FROM
                 epdc_issue t1
+                LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = t1.EVENT_ID AND u.DEL_FLAG = '0'
                 LEFT JOIN epdc_events t2
                 ON t1.EVENT_ID = t2.ID
                 AND t2.DEL_FLAG = '0'
                 WHERE t1.DEL_FLAG = '0'
                 AND t1.ISSUE_STATE = #{issueState}
-                AND t1.GRID_ID IN
-                <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
-                    #{id}
-                </foreach>
+                AND (t1.GRID_ID IN
+                        <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
+                            #{id}
+                        </foreach>
+                     OR u.WORK_USER_ID = #{workUserId}
+                    )
                 <![CDATA[ AND DATE_FORMAT(t1.DISTRIBUTE_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
                 ORDER BY
                 <if test='orderType == "1"'>( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC,</if>