【运营导出】【添加数据权限】-王公峰-2020-05-22

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java

@@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.user.form;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 @Data
@@ -21,4 +20,6 @@ public class ExportOperationFormDTO implements Serializable {
     private List<Long> allStreetIds;
 
     private String endTime;
+
+    private List<Long> deptIdList;
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

@@ -306,6 +306,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
 
     @Override
     public List<ExportOperationDataResultDTO> listExportOperationCount(ExportOperationFormDTO exportOperationFormDTO) {
+        exportOperationFormDTO.setDeptIdList(SecurityUser.getUser().getDeptIdList());
         List<Long> allStreetIds = new ArrayList<>();
         for (Long[] item : exportOperationFormDTO.getAllDeptIdsShow()) {
             allStreetIds.add(item[0]);

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -526,8 +526,6 @@
             AND ad.del_flag = 0
         ) t0
         ON find_in_set(t0.id, IFNULL(uu.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS))
-
-
         LEFT JOIN (
             SELECT MAX( CREATED_TIME ) AS CREATED_TIME, USER_ID
             FROM esua_epdc_user.epdc_user_authenticate_history
@@ -542,10 +540,11 @@
         ) MAXHIS ON MAXHIS.USER_ID = uu.ID
 
         LEFT JOIN esua_epdc_user.epdc_user_authenticate_history HISTORY  ON HISTORY.USER_ID = MAXHIS.USER_ID   AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME  AND HISTORY.DEL_FLAG = '0'
-
-
-
         where uu.DEL_FLAG = '0'
+        AND IFNULL(if(uu.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
+        <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
             AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
         </if>