事件管理列表查询

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.dto.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -28,6 +27,7 @@ public class IcEventListFormDTO implements Serializable {
     private String icEventId;
     /**
      * 所属组织
+     * 前端传入，如果没传，默认查询登录用户所属组织及下级
      */
     private String agencyId;
     /**

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -112,9 +112,11 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
     @Override
     public PageData<IcEventListResultDTO> list(IcEventListFormDTO formDTO) {
-        //获取当前工作人员缓存信息
-        CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-        formDTO.setAgencyId(staffInfo.getAgencyId());
+        if(StringUtils.isBlank(formDTO.getAgencyId())){
+            //获取当前工作人员缓存信息
+            CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+            formDTO.setAgencyId(staffInfo.getAgencyId());
+        }
 
         //分页查询当前组织下网格内事件数据
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());