From b422110c3c4f66b9d895cba64295b9c627cdf97c Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 12 Aug 2022 17:45:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/impl/SettingDictTypeServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java index 2ddb2496..3d746af6 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java @@ -128,9 +128,14 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { */ @Override public void add(DictTypeParam dictTypeParam) { - Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper() + Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper() .select("id") .eq("dict_name", dictTypeParam.getDictName()) + .eq("is_delete", 0) + .last("limit 1")), "字典名称已存在！"); + + Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper() + .select("id") .eq("dict_type", dictTypeParam.getDictType()) .eq("is_delete", 0) .last("limit 1")), "字典类型已存在！"); @@ -163,6 +168,11 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper() .ne("id", dictTypeParam.getId()) .eq("dict_name", dictTypeParam.getDictName()) + .eq("is_delete", 0) + .last("limit 1")), "字典类型已存在！"); + + Assert.isNull(dictTypeMapper.selectOne(new QueryWrapper() + .ne("id", dictTypeParam.getId()) .eq("dict_type", dictTypeParam.getDictType()) .eq("is_delete", 0) .last("limit 1")), "字典类型已存在！");