From ab7c70dcd7ecf83495927c8da8906e985ffe5334 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Tue, 21 May 2024 17:05:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E6=A8=A1=E7=89=88=E5=90=8D=E7=A7=B0=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=97=B6=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BasicdataPriceTemplateServiceImpl.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java
index ac0a05ab4..b52380c4a 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java
@@ -21,6 +21,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataPriceTemplateEntity;
@@ -204,14 +205,18 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl<Basicdata
 			default:
 				throw new ServiceException("当前选择的类型不存在");
 		}
-		checkName(priceTemplateEntity.getName());
+		checkName(priceTemplateEntity.getName(), priceTemplateEntity.getId());
 		this.baseMapper.updateById(priceTemplateEntity);
 		return Boolean.TRUE;
 	}
 
-	private void checkName(String name) {
-		BasicdataPriceTemplateEntity one = this.getOne(Wrappers.<BasicdataPriceTemplateEntity>lambdaQuery()
-			.eq(BasicdataPriceTemplateEntity::getName, name)
+	private void checkName(String name, Long id) {
+		LambdaQueryWrapper<BasicdataPriceTemplateEntity> wrapper = Wrappers.<BasicdataPriceTemplateEntity>lambdaQuery()
+			.eq(BasicdataPriceTemplateEntity::getName, name);
+		if (ObjectUtil.isNotEmpty(id)) {
+			wrapper.ne(BasicdataPriceTemplateEntity::getId, id);
+		}
+		BasicdataPriceTemplateEntity one = this.getOne(wrapper
 			.last("limit 1")
 		);
 		if (ObjectUtil.isNotEmpty(one)) {
@@ -240,7 +245,7 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl<Basicdata
 		} else {
 			basicdataPriceTemplate.setTemplateType("用户");
 		}
-		checkName(basicdataPriceTemplate.getName());
+		checkName(basicdataPriceTemplate.getName(),null);
 		this.save(basicdataPriceTemplate);
 		return basicdataPriceTemplate.getId();
 	}