Merge branch 'dev_question_naire' into release_temp

4 years ago · f64d2204b3
1 changed files with 2 additions and 1 deletions
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@ -733,9 +733,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
            CustomerAgencyEntity agency = customerAgencyService.selectById(gridInfo.getPid());
            gridInfo.setAgencyName(null != agency ? agency.getOrganizationName() : "");
            gridInfo.setGridNamePath(null != agency ? agency.getOrganizationName().concat("-").concat(gridInfo.getGridName()) : gridInfo.getGridName());
-        }

            redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
+        }
+
        return gridInfo;
    }