Merge remote-tracking branch 'remotes/origin/dev' into 市北测试

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -606,7 +606,7 @@ public class GovOrgServiceImpl implements GovOrgService {
                 List<OrgTreeResultDTO> list = buildTempOrgTree(agencyId, client);
                 redisUtils.set(treeCacheKey, list, RedisUtils.HOUR_FOUR_EXPIRE);
             });
-        } else {
+        } else if (CollectionUtils.isEmpty(orgTreeResultDTOS)){
             orgTreeResultDTOS = buildTempOrgTree(staffInfo.getAgencyId(), formDTO.getClient());
             redisUtils.set(treeCacheKey, orgTreeResultDTOS, RedisUtils.HOUR_FOUR_EXPIRE);
         }