From d93a346ee8696e2bd560cd0c303dc89ea3f9ab6d Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 17 Jun 2022 18:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/PointAdditiveRuleServiceImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 6a2607ed2f..706f572a52 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
@@ -205,10 +205,13 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
         return new Result<PointAdditiveRuleDTO>().ok(result);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Result modify(PointModifyFormDTO dto) {
         PointAdditiveRuleEntity entity = baseDao.selectById(dto.getId());
-
+        if(entity == null){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到相关信息","未查到相关信息");
+        }
         if(PointAddRuleEnum.CATEGORY_TYPE.getCode().equals(dto.getType())){
             //类别
             PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),dto.getCategoryName(),null);
@@ -216,6 +219,9 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在");
             }
             entity.setCategoryName(dto.getCategoryName());
+            if(StringUtils.isNotBlank(dto.getApplyFlag())){
+                entity.setApplyFlag(dto.getApplyFlag());
+            }
         }else if(PointAddRuleEnum.RULE_TYPE.getCode().equals(dto.getType())){
             //规则
             PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),null,dto.getRuleName());