From e74792fd5884a63df84ec6aeb788662add010414 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 20 Jun 2022 11:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/PointAdditiveRuleDao.java | 3 ++-
 .../epmet/service/impl/PointAdditiveRuleServiceImpl.java  | 8 ++++----
 .../src/main/resources/mapper/PointAdditiveRuleDao.xml    | 3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java
index 9e67740ec3..8b39e7d65b 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java
@@ -74,7 +74,8 @@ public interface PointAdditiveRuleDao extends BaseDao<PointAdditiveRuleEntity> {
     * @params [customerId, categoryName]
     * @return com.epmet.entity.PointAdditiveRuleEntity
     */
-    PointAdditiveRuleEntity selectEntityByName(@Param("customerId") String customerId,
+    PointAdditiveRuleEntity selectEntityByName(@Param("id") String id,
+                                               @Param("customerId") String customerId,
                                                @Param("categoryName")  String categoryName,
                                                @Param("ruleName")  String ruleName);
 
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 706f572a52..d65d63dd92 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
@@ -105,7 +105,7 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
 
     @Override
     public Result addcategory(AddcategoryFormDTO dto) {
-        PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),dto.getCategoryName(),null);
+        PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(null,dto.getCustomerId(),dto.getCategoryName(),null);
         if(isExist != null){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在");
         }
@@ -133,7 +133,7 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
 
     @Override
     public Result addrule(AddruleFormDTO dto) {
-        PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),null,dto.getRuleName());
+        PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(null,dto.getCustomerId(),null,dto.getRuleName());
         if(isExist != null){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在");
         }
@@ -214,7 +214,7 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
         }
         if(PointAddRuleEnum.CATEGORY_TYPE.getCode().equals(dto.getType())){
             //类别
-            PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),dto.getCategoryName(),null);
+            PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(null,dto.getCustomerId(),dto.getCategoryName(),null);
             if(isExist != null){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在");
             }
@@ -224,7 +224,7 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
             }
         }else if(PointAddRuleEnum.RULE_TYPE.getCode().equals(dto.getType())){
             //规则
-            PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),null,dto.getRuleName());
+            PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(null,dto.getCustomerId(),null,dto.getRuleName());
             if(isExist != null){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在");
             }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
index 4b3c086d91..958888b414 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
@@ -99,6 +99,9 @@
         FROM `point_additive_rule`
         where DEL_FLAG='0'
               and CUSTOMER_ID=#{customerId}
+            <if test="id != null and id != ''">
+                and id= #{id}
+            </if>
             <if test="categoryName != null and categoryName != ''">
                 and CATEGORY_NAME= #{categoryName}
             </if>