From 70dca06355c5a506915d0667d7c402bc9135b89a Mon Sep 17 00:00:00 2001 From: Guo XIn <371864209@qq.com> Date: Wed, 5 Jul 2023 15:03:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysDictServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysDictServiceImpl.java b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysDictServiceImpl.java index 75ead5e..f79747b 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysDictServiceImpl.java +++ b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysDictServiceImpl.java @@ -8,7 +8,9 @@ import com.keyware.shandan.system.entity.SysDictType; import com.keyware.shandan.system.mapper.SysDictMapper; import com.keyware.shandan.system.service.SysDictService; import com.keyware.shandan.system.utils.DictUtil; +import com.keyware.shandan.system.utils.StringUtil; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.io.Serializable; @@ -24,9 +26,12 @@ import java.io.Serializable; public class SysDictServiceImpl extends BaseServiceImpl implements SysDictService { @Override public Result updateOrSave(SysDict entity) throws Exception { - SysDict existDict = getDictByTypeAndName(entity.getTypeId(), entity.getDictName()); - if(existDict != null){ - return Result.of(null, false, "字典名称已存在"); + SysDict old = getById(entity.getId()); + if(old == null || !entity.getDictName().equals(old.getDictName())){ + SysDict existDict = getDictByTypeAndName(entity.getTypeId(), entity.getDictName()); + if(existDict != null){ + return Result.of(null, false, "字典名称已存在"); + } } entity.setDictCode(entity.getDictName()); // entity.setDictValue(entity.getDictName());