Merge remote-tracking branch 'origin/develop' into release_temp

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

@@ -26,7 +26,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -811,6 +813,13 @@ public class AgencyServiceImpl implements AgencyService {
             throw new EpmetException("未查询到工作人员信息"+staffInfo.getStaffId());
         }
         String agencyId = staffInfo.getAgencyId();
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId);
+        if (null == agencyInfo){
+            throw new EpmetException("查询组织信息失败"+agencyInfo);
+        }
+        if (agencyInfo.getLevel().equals(CustomerAgencyConstant.COMMUNITY_LEVEL)){
+            return new ArrayList<>();
+        }
         return customerAgencyDao.getCommunityList(tokenDto.getCustomerId(), agencyId);
     }