名称校验调整

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);
 

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(), "该名称已存在","该名称已存在");
             }

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>