orgId

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java

@@ -51,7 +51,7 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
                                                     @Param("startDate")Date startDate,
                                                     @Param("endDate")Date endDate);
 
-    List<CommunityLoginResultDTO> pageStreetCount(@Param("orgIdPath")String orgIdPath,
+    List<CommunityLoginResultDTO> pageStreetCount(@Param("orgId")String orgId,
                                                   @Param("startDate")Date startDate,
                                                   @Param("endDate")Date endDate);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java

@@ -274,15 +274,14 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
             CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
             orgId=staffInfoCacheResult.getAgencyId();
         }
-        String orgIdPath = SpringContextUtils.getBean(CustomerAgencyService.class).getOrgIdPath(orgId);
         if (isPage) {
             PageHelper.startPage(pageNo, pageSize);
-            List<CommunityLoginResultDTO> list = baseDao.pageStreetCount(orgIdPath, startDate, endDate);
+            List<CommunityLoginResultDTO> list = baseDao.pageStreetCount(orgId, startDate, endDate);
             PageInfo<CommunityLoginResultDTO> pageInfo = new PageInfo<>(list);
             return new PageData<>(list, pageInfo.getTotal(),pageSize);
         }
         // 不分页
-        List<CommunityLoginResultDTO> list = baseDao.pageStreetCount(orgIdPath,startDate, endDate);
+        List<CommunityLoginResultDTO> list = baseDao.pageStreetCount(orgId,startDate, endDate);
         int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
         return new PageData<>(list, total, total);
     }