From 306d979b440e74f6e7256e3d5a626a4e9f39a83f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 30 Mar 2021 09:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerProjectCategoryDictServiceImpl.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/CustomerProjectCategoryDictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/CustomerProjectCategoryDictServiceImpl.java
index b610fa9c6c..97a8a560f5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/CustomerProjectCategoryDictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/CustomerProjectCategoryDictServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.entity.stats.CustomerProjectCategoryDictEntity;
 import com.epmet.service.stats.CustomerProjectCategoryDictService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -67,17 +68,19 @@ public class CustomerProjectCategoryDictServiceImpl extends BaseServiceImpl<Cust
         });
         updateCategoies.forEach(updatedEntity -> {
             CustomerProjectCategoryDictEntity entity=baseDao.selectByCustomerIdAndId(updatedEntity.getCustomerId(),updatedEntity.getId());
-            if(null!=entity){
+            if (null != entity) {
                 entity.setCategoryCode(updatedEntity.getCategoryCode());
                 entity.setCategoryName(updatedEntity.getCategoryName());
                 entity.setParentCategoryCode(updatedEntity.getParentCategoryCode());
-                entity.setLevel(Integer.valueOf(updatedEntity.getCategoryType()));
+                if (StringUtils.isNotBlank(updatedEntity.getCategoryType())) {
+                    entity.setLevel(Integer.valueOf(updatedEntity.getCategoryType()));
+                }
                 entity.setSort(updatedEntity.getSort());
                 entity.setIsDisable(updatedEntity.getIsDisable());
                 entity.setOriginCreatedTime(updatedEntity.getCreatedTime());
                 entity.setOriginUpdatedTime(updatedEntity.getUpdatedTime());
+                baseDao.updateById(entity);
             }
-            baseDao.updateById(entity);
         });
     }