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

4 years ago · 0520432a24
1 changed files with 3 additions and 0 deletions
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@ -570,6 +570,9 @@ public class AgencyServiceImpl implements AgencyService {
        MapOrgResultDTO result = new MapOrgResultDTO();
        if (StringUtils.isBlank(formDTO.getOrgId())){
            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == staffInfo){
+                return result;
+            }
            formDTO.setOrgId(staffInfo.getFromOrgId());
            formDTO.setLevel(staffInfo.getFromOrgType());
        }