/sys/log/operation/page去掉orgIdPath

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

@@ -41,8 +41,7 @@ public interface LogOperationDao extends BaseDao<LogOperationEntity> {
                                          @Param("endTime")String endTime,
                                          @Param("operatorName")String operatorName,
                                          @Param("operatorMobile")String operatorMobile,
-                                         @Param("category")String category,
-                                         @Param("agencyId")String agencyId);
+                                         @Param("category")String category);
 
     List<Map<String,String>> getStaffId();
 

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

@@ -8,7 +8,6 @@ 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;
@@ -202,13 +201,13 @@ 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, TokenDto tokenDto) {
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-        if (null == staffInfo){
-            throw new EpmetException("未查询工作人员信息："+tokenDto.getUserId());
-        }
+        // 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,staffInfo.getAgencyId());
+        List<LogOperationResultDTO> list = logOperationDao.pageList(customerId, startTime, endTime, operatorName, operatorMobile,category);
         PageInfo<LogOperationResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }

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

@@ -64,7 +64,6 @@
         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>