From ccd4eb9dc0585334ee266a045ae6cd48560d3c30 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 16 Jun 2022 17:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99pids?=
 =?UTF-8?q?=E7=BB=84=E8=A3=85=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PointAdditiveRuleServiceImpl.java    | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java
index bae799657f..daffeca2fc 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java
@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.common.enu.PointAddRuleEnum;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.PointAdditiveRuleDao;
 import com.epmet.dto.CategorydetailResultDTO;
@@ -114,7 +116,14 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
         entity.setPid(dto.getPid());
         if(!NumConstant.ZERO_STR.equals(dto.getPid())){
             PointAdditiveRuleEntity parentEntity = baseDao.selectById(dto.getPid());
-            entity.setPids(parentEntity.getPids()+":"+parentEntity.getId());
+            if(null == parentEntity){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到父节点信息","未查到父节点信息");
+            }
+            if(StringUtils.isBlank(parentEntity.getPids())){
+                entity.setPids(parentEntity.getId());
+            }else{
+                entity.setPids(parentEntity.getPids()+":"+parentEntity.getId());
+            }
             entity.setCategoryCode(parentEntity.getCategoryCode());
         }
         insert(entity);
@@ -132,8 +141,15 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
         entity.setPid(dto.getPid());
         if(!NumConstant.ZERO_STR.equals(dto.getPid())){
             PointAdditiveRuleEntity parentEntity = baseDao.selectById(dto.getPid());
+            if(null == parentEntity){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到父节点信息","未查到父节点信息");
+            }
+            if(StringUtils.isBlank(parentEntity.getPids())){
+                entity.setPids(parentEntity.getId());
+            }else{
+                entity.setPids(parentEntity.getPids()+":"+parentEntity.getId());
+            }
             entity.setCategoryCode(parentEntity.getCategoryCode());
-            entity.setPids(parentEntity.getPids()+":"+parentEntity.getId());
         }
         insert(entity);
         return new Result().ok("新增成功！");