Merge remote-tracking branch 'origin/master'

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java

@@ -20,6 +20,16 @@ public class CaLoudongFormDTO  implements Serializable {
      */
     private String buildingName;
 
+    /**
+     * userId
+     */
+    private String userId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
     /**
      * 网格id
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java

@@ -9,6 +9,16 @@ public class CaPingfangFormDTO implements Serializable {
 
     private static final long serialVersionUID = 7714897295294884648L;
 
+    /**
+     * userId
+     */
+    private String userId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
     /**
      * 楼栋名称
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java

@@ -9,6 +9,16 @@ public class CaRentalFormtDTO implements Serializable {
 
     private static final long serialVersionUID = -6052280300032032361L;
 
+    /**
+     * userId
+     */
+    private String userId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
     /**
      * 房主姓名
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java

@@ -13,6 +13,17 @@ public class CaResidentFormDTO implements Serializable {
 
     private Integer limit;
 
+    /**
+     * userId
+     */
+    private String userId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+
     /**
      * 姓名
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java

@@ -10,6 +10,16 @@ public class CaRotatorsFormDTO implements Serializable {
 
     private static final long serialVersionUID = 3356808153818385932L;
 
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * userId
+     */
+    private String userId;
+
     /**
      * 姓名
      */

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java

@@ -96,6 +96,8 @@ public class CaLoudongController {
      */
     @PostMapping("getPage")
     public Result<PageData<CaLoudongResultDTO>> getPage(@RequestBody CaLoudongFormDTO dto, @LoginUser TokenDto tokenDto) {
+        dto.setUserId(tokenDto.getUserId());
+        dto.setCustomerId(tokenDto.getCustomerId());
         PageData<CaLoudongResultDTO> data = caLoudongService.getPage(dto);
         return new Result<PageData<CaLoudongResultDTO>>().ok(data);
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java

@@ -92,6 +92,8 @@ public class CaPingfangController {
      */
     @PostMapping("getPage")
     public Result<PageData> getPage(@RequestBody CaPingfangFormDTO dto, @LoginUser TokenDto tokenDto) {
+        dto.setUserId(tokenDto.getUserId());
+        dto.setCustomerId(tokenDto.getCustomerId());
         PageData data = caPingfangService.getPage(dto);
         return new Result<PageData>().ok(data);
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRentalController.java

@@ -95,6 +95,8 @@ public class CaRentalController {
      */
     @PostMapping("getPage")
     public Result<PageData<CaRentalResultDTO>> getPage(@RequestBody CaRentalFormtDTO dto, @LoginUser TokenDto tokenDto) {
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setUserId(tokenDto.getUserId());
         PageData<CaRentalResultDTO> data = caRentalService.getPage(dto);
         return new Result<PageData<CaRentalResultDTO>>().ok(data);
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java

@@ -98,6 +98,8 @@ public class CaResidentController {
      */
     @PostMapping("getPage")
     public Result<PageData<CaResidentResultDTO>> getPage(@RequestBody CaResidentFormDTO dto, @LoginUser TokenDto tokenDto) {
+        dto.setUserId(tokenDto.getUserId());
+        dto.setCustomerId(tokenDto.getCustomerId());
         PageData<CaResidentResultDTO> data = caResidentService.getPage(dto);
         return new Result<PageData<CaResidentResultDTO>>().ok(data);
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRotatorsController.java

@@ -95,6 +95,8 @@ public class CaRotatorsController {
      */
     @PostMapping("getPage")
     public Result<PageData<CaRotatorsResultDTO>> getPage(@RequestBody CaRotatorsFormDTO dto, @LoginUser TokenDto tokenDto) {
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setUserId(tokenDto.getUserId());
         PageData<CaRotatorsResultDTO> data = caRotatorsService.getPage(dto);
         return new Result<PageData<CaRotatorsResultDTO>>().ok(data);
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java

@@ -34,7 +34,8 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
      */
     List<CaLoudongResultDTO> getPage(@Param("communityName") String communityName,
                                      @Param("buildingName") String buildingName,
-                                     @Param("gridId") String gridId);
+                                     @Param("gridId") String gridId,
+                                     @Param("gridList") List<String> gridList);
 
     /**
      * 楼栋基本信息详情

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java

@@ -24,7 +24,8 @@ public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
      */
     List<CaPingfangResultDTO> getPage(@Param("buildingName") String buildingName,
                                       @Param("communityName") String communityName,
-                                      @Param("gridId") String gridId);
+                                      @Param("gridId") String gridId,
+                                      @Param("gridList") List<String> gridList);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java

@@ -29,7 +29,8 @@ public interface CaRentalDao extends BaseDao<CaRentalEntity> {
     List<CaRentalResultDTO> getPage(@Param("residentName") String residentName,
                                     @Param("houseName") String houseName,
                                     @Param("renterName") String renterName,
-                                    @Param("gridId") String gridId);
+                                    @Param("gridId") String gridId,
+                                    @Param("gridList") List<String> gridList);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java

@@ -31,7 +31,8 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
     List<CaResidentResultDTO> getPage(@Param("residentName") String residentName,
                                       @Param("idCard") String idCard,
                                       @Param("telephone") String telephone,
-                                      @Param("gridId") String gridId);
+                                      @Param("gridId") String gridId,
+                                      @Param("gridList") List<String> gridList);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java

@@ -29,7 +29,8 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
     List<CaRotatorsResultDTO> getPage(@Param("rotatorsName") String rotatorsName,
                                       @Param("idCard") String idCard,
                                       @Param("telephone") String telephone,
-                                      @Param("gridId") String gridId);
+                                      @Param("gridId") String gridId,
+                                      @Param("gridList") List<String> gridList);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java

@@ -1,13 +1,23 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.enums.OrgLevelEnum;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.*;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
+import com.epmet.dto.result.CustomerStaffGridResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaLoudongDao;
 import com.epmet.opendata.dto.ca.CaLoudongDTO;
 import com.epmet.opendata.dto.constant.CaWghDataConstant;
@@ -42,6 +52,9 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
     @Autowired
     private CaLoudongRedis caLoudongRedis;
 
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
 //    @Override
 //    public PageData<CaLoudongDTO> page(Map<String, Object> params) {
 //        IPage<CaLoudongEntity> page = baseDao.selectPage(
@@ -104,12 +117,36 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
 
     @Override
     public PageData<CaLoudongResultDTO> getPage(CaLoudongFormDTO dto) {
+        // 获取组织id
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
+        String agencyId = staffInfo.getAgencyId();
+        // 根据组织id获取gridId网格id
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
+        List<String> gridList = new ArrayList<>();
+        gridList.add(agencyId);
+        this.packGirdArray(gridOption.getData(), gridList);
+
         PageHelper.startPage(dto.getPage(), dto.getLimit());
-        List<CaLoudongResultDTO> result = baseDao.getPage(dto.getCommunityName(), dto.getBuildingName(),dto.getGridId());
+        List<CaLoudongResultDTO> result = baseDao.getPage(dto.getCommunityName(),
+                dto.getBuildingName(),
+                dto.getGridId(),
+                gridList);
         PageInfo<CaLoudongResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }
 
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 楼栋基本信息详情
      *

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,10 +8,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
+import com.epmet.dto.result.CustomerStaffGridResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaPingfangDao;
 import com.epmet.opendata.dto.ca.CaPingfangDTO;
 import com.epmet.opendata.dto.constant.CaWghDataConstant;
@@ -30,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +54,9 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
     @Autowired
     private CaPingfangRedis caPingfangRedis;
 
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
     @Override
     public PageData<CaPingfangDTO> page(Map<String, Object> params) {
         IPage<CaPingfangEntity> page = baseDao.selectPage(
@@ -98,12 +111,36 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
 
     @Override
     public PageData getPage(CaPingfangFormDTO dto) {
+        // 获取组织id
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
+        String agencyId = staffInfo.getAgencyId();
+        // 根据组织id获取gridId网格id
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
+        List<String> gridList = new ArrayList<>();
+        gridList.add(agencyId);
+        this.packGirdArray(gridOption.getData(), gridList);
+
         PageHelper.startPage(dto.getPage(), dto.getLimit());
-        List<CaPingfangResultDTO> result = baseDao.getPage(dto.getBuildingName(), dto.getCommunityName(),dto.getGridId());
+        List<CaPingfangResultDTO> result = baseDao.getPage(dto.getBuildingName(),
+                dto.getCommunityName(),
+                dto.getGridId(),
+                gridList);
         PageInfo<CaPingfangResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }
 
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 平房调用ruoyi接口存储数据
      *

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java

@@ -1,17 +1,26 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
+import com.epmet.dto.result.CustomerStaffGridResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaRentalDao;
 import com.epmet.opendata.dto.ca.CaRentalDTO;
 import com.epmet.opendata.dto.constant.CaWghDataConstant;
@@ -31,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -47,6 +57,9 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
     @Autowired
     private CaRentalRedis caRentalRedis;
 
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
     @Override
     public PageData<CaRentalDTO> page(Map<String, Object> params) {
         IPage<CaRentalEntity> page = baseDao.selectPage(
@@ -101,15 +114,37 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
 
     @Override
     public PageData<CaRentalResultDTO> getPage(CaRentalFormtDTO dto) {
+        // 获取组织id
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
+        String agencyId = staffInfo.getAgencyId();
+        // 根据组织id获取gridId网格id
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
+        List<String> gridList = new ArrayList<>();
+        gridList.add(agencyId);
+        this.packGirdArray(gridOption.getData(), gridList);
+
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         List<CaRentalResultDTO> result = baseDao.getPage(dto.getResidentName(),
                 dto.getHouseName(),
                 dto.getRenterName(),
-                dto.getGridId());
+                dto.getGridId(),
+                gridList);
         PageInfo<CaRentalResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }
 
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 出租房调用ruoyi接口存储数据
      *

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,12 +9,20 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 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.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
+import com.epmet.dto.result.CustomerStaffGridResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaResidentDao;
 import com.epmet.opendata.dto.ca.CaResidentDTO;
 import com.epmet.opendata.dto.constant.CaWghDataConstant;
@@ -35,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -54,6 +64,9 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
     @Autowired
     private EpmetUserOpenFeignClient openFeignClient;
 
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
     @Override
     public PageData<CaResidentDTO> page(Map<String, Object> params) {
         IPage<CaResidentEntity> page = baseDao.selectPage(
@@ -108,15 +121,39 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
 
     @Override
     public PageData<CaResidentResultDTO> getPage(CaResidentFormDTO dto) {
+        // 获取组织id
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
+        String agencyId = staffInfo.getAgencyId();
+        // 根据组织id获取gridId网格id
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
+        List<String> gridList = new ArrayList<>();
+        gridList.add(agencyId);
+        this.packGirdArray(gridOption.getData(), gridList);
+
+        // 分页查询
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         List<CaResidentResultDTO> result = baseDao.getPage(dto.getResidentName(),
                 dto.getIdCard(),
                 dto.getTelephone(),
-                dto.getGridId());
+                dto.getGridId(),
+                gridList);
         PageInfo<CaResidentResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }
 
+
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 人口基本信息调用ruoyi接口存储数据
      *

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java

@@ -1,17 +1,26 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
+import com.epmet.dto.result.CustomerStaffGridResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaRotatorsDao;
 import com.epmet.opendata.dto.ca.CaRotatorsDTO;
 import com.epmet.opendata.dto.constant.CaWghDataConstant;
@@ -31,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -50,6 +60,9 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
     @Autowired
     private EpmetUserOpenFeignClient openFeignClient;
 
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
     @Override
     public PageData<CaRotatorsDTO> page(Map<String, Object> params) {
         IPage<CaRotatorsEntity> page = baseDao.selectPage(
@@ -104,15 +117,38 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
 
     @Override
     public PageData<CaRotatorsResultDTO> getPage(CaRotatorsFormDTO dto) {
+        // 获取组织id
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
+        String agencyId = staffInfo.getAgencyId();
+        // 根据组织id获取gridId网格id
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
+        List<String> gridList = new ArrayList<>();
+        gridList.add(agencyId);
+        this.packGirdArray(gridOption.getData(), gridList);
+
+
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         List<CaRotatorsResultDTO> result = baseDao.getPage(dto.getRotatorsName(),
                 dto.getIdCard(),
                 dto.getTelephone(),
-                dto.getGridId());
+                dto.getGridId(),
+                gridList);
         PageInfo<CaRotatorsResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }
 
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 流动人口调用ruoyi接口存储数据
      *

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml

@@ -88,7 +88,21 @@
         vs.street_name
         FROM
             ca_loudong as ca
-        LEFT JOIN view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id
+        INNER JOIN (
+            SELECT
+                viewca.grid_id,
+                viewca.grid_name,
+                viewca.community_name,
+                viewca.street_name,
+                viewca.business_org_id
+            FROM
+                view_grid_comm_street_ca viewca
+        WHERE
+            viewca.business_org_id IN
+        <foreach collection="gridList" open="(" close=")" separator="," item="gridId">
+            #{gridId}
+        </foreach>
+        ) AS vs ON ca.grid_id = vs.grid_id
         <where>
             ca.delete_flag = 'normal'
             <if test="communityName != null and communityName != ''">
@@ -98,7 +112,7 @@
                 AND ca.building_name like '%${buildingName}%'
             </if>
             <if test="gridId != null and gridId != ''">
-                AND vs.grid_id_path like '%${gridId}%'
+                AND vs.business_org_id = #{gridId}
             </if>
         </where>
         order by ca.grid_id,ca.building_id,ca.community_id desc

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml

@@ -85,7 +85,21 @@
             vs.street_name
         FROM
             ca_pingfang as ca
-        left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id
+        INNER JOIN (
+            SELECT
+            viewca.grid_id,
+            viewca.grid_name,
+            viewca.community_name,
+            viewca.street_name,
+            viewca.business_org_id
+        FROM
+            view_grid_comm_street_ca viewca
+        WHERE
+            viewca.business_org_id IN
+            <foreach collection="gridList" open="(" close=")" separator="," item="gridId">
+                #{gridId}
+            </foreach>
+            ) AS vs ON ca.grid_id = vs.grid_id
         <where>
             ca.delete_flag = 'normal'
             <if test="buildingName != null and buildingName != ''">
@@ -95,7 +109,7 @@
                 AND ca.community_name like '%${communityName}%'
             </if>
             <if test="gridId != null and gridId != ''">
-                AND vs.grid_id_path like '%${gridId}%'
+                AND vs.business_org_id = #{gridId}
             </if>
         </where>
         order by ca.grid_id,ca.building_id,ca.community_id desc

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml

@@ -77,7 +77,21 @@
             vs.street_name
         FROM
             ca_rental as ca
-        left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id
+        INNER JOIN (
+            SELECT
+            viewca.grid_id,
+            viewca.grid_name,
+            viewca.community_name,
+            viewca.street_name,
+            viewca.business_org_id
+        FROM
+            view_grid_comm_street_ca viewca
+        WHERE
+            viewca.business_org_id IN
+        <foreach collection="gridList" open="(" close=")" separator="," item="gridId">
+            #{gridId}
+        </foreach>
+        ) AS vs ON ca.grid_id = vs.grid_id
         <where>
             ca.delete_flag = 'normal'
             <if test="residentName != null and residentName != ''">
@@ -90,7 +104,7 @@
                 AND ca.renter_name like '%${renterName}%'
             </if>
             <if test="gridId != null and gridId != ''">
-                AND vs.grid_id_path like '%${gridId}%'
+                AND vs.business_org_id = #{gridId}
             </if>
         </where>
         order by ca.grid_id,ca.rental_id,ca.id_card desc

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml

@@ -108,7 +108,21 @@
             cau.ic_resi_user_id
         FROM
             ca_resident as ca
-        left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id
+        INNER JOIN (
+            SELECT
+            viewca.grid_id,
+            viewca.grid_name,
+            viewca.community_name,
+            viewca.street_name,
+            viewca.business_org_id
+        FROM
+            view_grid_comm_street_ca viewca
+            WHERE
+            viewca.business_org_id IN
+                <foreach collection="gridList" open="(" close=")" separator="," item="gridId">
+                    #{gridId}
+                </foreach>
+            ) AS vs ON ca.grid_id = vs.grid_id
         left join ca_resident_user as cau on cau.id_card = ca.id_card and del_flag = '0'
             <where>
                 ca.delete_flag = 'normal'
@@ -122,7 +136,7 @@
                     AND ca.telephone like '%${telephone}%'
                 </if>
                 <if test="gridId != null and gridId != ''">
-                    AND vs.grid_id_path like '%${gridId}%'
+                    AND vs.business_org_id = #{gridId}
                 </if>
             </where>
             order by ca.grid_id,ca.resident_id,ca.id_card desc

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml

@@ -109,7 +109,21 @@
             vs.street_name
         FROM
             ca_rotators as ca
-        left join view_grid_comm_street_ca as vs on vs.grid_id = ca.grid_id
+        INNER JOIN (
+            SELECT
+            viewca.grid_id,
+            viewca.grid_name,
+            viewca.community_name,
+            viewca.street_name,
+            viewca.business_org_id
+        FROM
+            view_grid_comm_street_ca viewca
+        WHERE
+        viewca.business_org_id IN
+        <foreach collection="gridList" open="(" close=")" separator="," item="gridId">
+            #{gridId}
+        </foreach>
+        ) AS vs ON ca.grid_id = vs.grid_id
             <where>
                 ca.delete_flag = 'normal'
                 <if test="rotatorsName != null and rotatorsName != ''">
@@ -122,7 +136,7 @@
                     AND ca.telephone like '%${telephone}%'
                 </if>
                 <if test="gridId != null and gridId != ''">
-                    AND vs.grid_id_path like '%${gridId}%'
+                    AND vs.business_org_id = #{gridId}
                 </if>
             </where>
             order by ca.grid_id,ca.rotators_id,ca.id_card desc