九小场所列表展示本机及下级

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java

@@ -54,7 +54,7 @@ public class GetListPlaceOrgFormDTO implements Serializable {
     private String placeOrgId;
     //token中userId
     private String staffId;
-    //token中userId所属组织的pid
+    //token中userId所属组织
-    private String pids;
+    private String agencyId;
 
 }

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

@@ -143,7 +143,7 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
     public GetListPlaceOrgResultDTO getList(GetListPlaceOrgFormDTO formDTO) {
         GetListPlaceOrgResultDTO resultDTO = new GetListPlaceOrgResultDTO();
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-        formDTO.setPids(staffInfoCache.getAgencyPIds());
+        formDTO.setAgencyId(staffInfoCache.getAgencyId());
         //1.根据查询条件分页查询场所数据
         PageInfo<PlaceOrgDetailResultDTO> result =
                 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO));

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml

@@ -25,8 +25,8 @@
         <if test="customerId != null and customerId.trim() != ''">
             AND a.customer_id = #{customerId}
         </if>
-        <if test="pids != null and pids.trim() != ''">
+        <if test="agencyId != null and agencyId.trim() != ''">
-            AND a.pids LIKE CONCAT('%', #{pids}, '%')
+            AND (a.AGENCY_ID =#{agencyId} or a.PIDS LIKE CONCAT('%', #{agencyId}, '%') )
         </if>
         <if test="gridId != null and gridId.trim() != ''">
             AND a.grid_id = #{gridId}