From 1d80a52a2d5e8e5325d0898ee43027ee761af9f5 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 17 Aug 2022 16:43:03 +0800
Subject: [PATCH] bug

---
 .../service/impl/IcEnterpriseServiceImpl.java | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
index 59ec2d331b..265a2018d5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
@@ -477,41 +477,41 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
 
         if (formDTO != null) {
             if (!origin.getPlaceType().equals(formDTO.getPlaceType())) {
-                record.setPlaceType(record.getPlaceType().concat("->").concat(formDTO.getPlaceType()));
+                record.setPlaceType(origin.getPlaceType().concat("->").concat(formDTO.getPlaceType()));
                 List<IcCoverageCategoryDictListResultDTO> categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol");
                 Map<String, String> categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel));
-                record.setPlaceType(categoryMap.get(record.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType())));
+                record.setPlaceType(categoryMap.get(origin.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType())));
             }
 
             if (!origin.getGridId().equals(formDTO.getGridId())) {
-                CustomerGridEntity originGrid = customerGridDao.selectById(record.getGridId());
+                CustomerGridEntity originGrid = customerGridDao.selectById(origin.getGridId());
                 CustomerGridEntity thisGrid = customerGridDao.selectById(formDTO.getGridId());
-                record.setGridId(record.getGridId().concat("->").concat(thisGrid.getGridName()));
+                record.setGridId(origin.getGridId().concat("->").concat(thisGrid.getGridName()));
                 if (originGrid != null && thisGrid != null) {
                     record.setGridId(originGrid.getGridName().concat("->").concat(formDTO.getGridId()));
                 }
             }
             if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) {
-                record.setPlaceOrgName(record.getPlaceOrgName().concat("->").concat(record.getPlaceOrgName()));
+                record.setPlaceOrgName(origin.getPlaceOrgName().concat("->").concat(formDTO.getPlaceOrgName()));
             }
             if (!origin.getScale().equals(formDTO.getScale())) {
-                record.setScale(record.getScale().concat("->").concat(formDTO.getScale()));
+                record.setScale(origin.getScale().concat("->").concat(formDTO.getScale()));
                 Result<Map<String, String>> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode());
                 if (!result.success() || null == result.getData()) {
                     throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result));
                 } else {
                     Map<String, String> scaleMap = result.getData();
-                    record.setScale(scaleMap.get(record.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale())));
+                    record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale())));
                 }
             }
             if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) {
-                record.setPersonInCharge(record.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge()));
+                record.setPersonInCharge(origin.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge()));
             }
             if (!origin.getMobile().equals(formDTO.getMobile())) {
-                record.setMobile(record.getMobile().concat("->").concat(formDTO.getMobile()));
+                record.setMobile(origin.getMobile().concat("->").concat(formDTO.getMobile()));
             }
             if (!origin.getAddress().equals(formDTO.getAddress())) {
-                record.setAddress(record.getAddress().concat("->").concat(formDTO.getAddress()));
+                record.setAddress(origin.getAddress().concat("->").concat(formDTO.getAddress()));
             }
         }