列表

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java

@@ -1,8 +1,10 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -52,7 +54,7 @@ public class LogOperationController {
      * @return
      */
     @PostMapping("page")
-    public Result<PageData<LogOperationResultDTO>> page(@RequestBody LogOperationListFormDTO formDTO){
+    public Result<PageData<LogOperationResultDTO>> page(@RequestBody LogOperationListFormDTO formDTO, @LoginUser TokenDto tokenDto){
         return new Result<PageData<LogOperationResultDTO>>().ok(logOperationService.page(loginUserUtil.getLoginUserCustomerId(),
                 formDTO.getStartTime(),
                 formDTO.getEndTime(),
@@ -60,7 +62,7 @@ public class LogOperationController {
                 formDTO.getOperatorMobile(),
                 formDTO.getPageNo(),
                 formDTO.getPageSize(),
-                formDTO.getCategory()));
+                formDTO.getCategory(),tokenDto));
     }
 
     @PostMapping("complementLogOperation")

epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java

@@ -41,9 +41,10 @@ public interface LogOperationDao extends BaseDao<LogOperationEntity> {
                                          @Param("endTime")String endTime,
                                          @Param("operatorName")String operatorName,
                                          @Param("operatorMobile")String operatorMobile,
-                                         @Param("category")String category);
+                                         @Param("category")String category,
+                                         @Param("agencyId")String agencyId);
 
-    Map<String,String> getStaffId();
+    List<Map<String,String>> getStaffId();
 
     void updateBatchLog(@Param("list") List<ComplementLogOperationDTO> list);
 

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java

@@ -1,6 +1,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.entity.LogOperationEntity;
 
@@ -41,7 +42,7 @@ public interface LogOperationService {
                                          String endTime,
                                          String operatorName,
                                          String operatorMobile,
-                                         Integer pageNo, Integer pageSize,String category);
+                                         Integer pageNo, Integer pageSize, String category, TokenDto tokenDto);
 
     void complementLogOperation();
 

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java

@@ -8,9 +8,11 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.LogOperationDao;
 import com.epmet.dto.ComplementLogOperationDTO;
@@ -199,10 +201,14 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR
      */
     @Override
     public PageData<LogOperationResultDTO> page(String customerId, String startTime, String endTime, String operatorName, String operatorMobile,
-                                                Integer pageNo, Integer pageSize,String category) {
+                                                Integer pageNo, Integer pageSize, String category, TokenDto tokenDto) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo){
+            throw new EpmetException("未查询工作人员信息："+tokenDto.getUserId());
+        }
         // 列表/导出查询
         PageHelper.startPage(pageNo, pageSize);
-        List<LogOperationResultDTO> list = logOperationDao.pageList(customerId, startTime, endTime, operatorName, operatorMobile,category);
+        List<LogOperationResultDTO> list = logOperationDao.pageList(customerId, startTime, endTime, operatorName, operatorMobile,category,staffInfo.getAgencyId());
         PageInfo<LogOperationResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }

epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml

@@ -64,6 +64,7 @@
         WHERE
             lo.del_flag = '0'
             AND lo.CUSTOMER_ID = #{customerId}
+            AND lo.ORG_ID_PATH LIKE concat('%',#{agencyId},'%')
         <if test="category != null and category != ''">
             AND lo.CATEGORY = #{category}
         </if>