/icneighborhood/neighborhoodoption默认查询当前工作人员所属组织下的小区列表

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@@ -17,8 +17,10 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -91,8 +93,8 @@ public class IcNeighborHoodController {
      * @Date 2021/10/26 14:38
      */
     @PostMapping("neighborhoodoption")
-    public Result<List<OptionResultDTO>> getNeighborHoodOptions(@RequestBody IcNeighborHoodDTO dto) {
+    public Result<List<OptionResultDTO>> getNeighborHoodOptions(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) {
-        return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId()));
+        return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId(),tokenDto.getUserId(),tokenDto.getCustomerId()));
     }
 
     /**

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

@@ -102,7 +102,7 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      * @Author zhaoqifeng
      * @Date 2021/10/26 14:32
      */
-    List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId);
+    List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId,String staffId,String customerId);
 
     /**
      * @Description 通过ID查询小区信息

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

@@ -22,8 +22,10 @@ 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.FieldConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 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.dao.IcNeighborHoodDao;
 import com.epmet.dto.IcNeighborHoodDTO;
@@ -113,13 +115,18 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
      * @Date 2021/10/26 14:32
      */
     @Override
-    public List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId) {
+    public List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId,String staffId,String customerId) {
-        if (StringUtils.isBlank(agencyId)) {
+        if (StringUtils.isBlank(agencyId)&&StringUtils.isEmpty(gridId)) {
-            log.error("组织ID为空");
+            log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区");
+            CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(customerId,staffId);
+            if (null == result || StringUtils.isBlank(result.getAgencyId())) {
+                log.error(String.format("staffId:%s,工作人员缓存信息查询异常"));
                 return Collections.emptyList();
             }
+           agencyId=result.getAgencyId();
+        }
         LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IcNeighborHoodEntity::getAgencyId, agencyId);
+        wrapper.eq(StringUtils.isNotBlank(agencyId),IcNeighborHoodEntity::getAgencyId, agencyId);
         wrapper.eq(StringUtils.isNotBlank(gridId), IcNeighborHoodEntity::getGridId, gridId);
         wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC");
         List<IcNeighborHoodEntity> list = baseDao.selectList(wrapper);