From 5693e0e740d8a55b69190a48d3e276d6a106e76a Mon Sep 17 00:00:00 2001 From: "hongxi.lian" Date: Fri, 3 Nov 2023 09:19:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E6=8D=AE=E5=AD=97=E5=85=B8=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=9F=A5=E8=AF=A2=E6=A0=87=E7=AD=BE=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dict/core/util/DictFrameworkUtils.java | 4 +--- .../service/dict/DictDataServiceImpl.java | 20 ++++++------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/win-framework/win-spring-boot-starter-biz-dict/src/main/java/com/win/framework/dict/core/util/DictFrameworkUtils.java b/win-framework/win-spring-boot-starter-biz-dict/src/main/java/com/win/framework/dict/core/util/DictFrameworkUtils.java index df746693..54607a5b 100644 --- a/win-framework/win-spring-boot-starter-biz-dict/src/main/java/com/win/framework/dict/core/util/DictFrameworkUtils.java +++ b/win-framework/win-spring-boot-starter-biz-dict/src/main/java/com/win/framework/dict/core/util/DictFrameworkUtils.java @@ -1,6 +1,4 @@ -package com.win.framework.dict.core.util; - -import cn.hutool.core.util.ObjectUtil; +package com.win.framework.dict.core.util;import cn.hutool.core.util.ObjectUtil; import com.win.framework.common.core.KeyValue; import com.win.framework.common.util.cache.CacheUtils; import com.win.module.system.api.dict.DictDataApi; diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java index 727466ee..5aa3e4e8 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java @@ -209,21 +209,13 @@ public class DictDataServiceImpl implements DictDataService { @Override public DictDataDO selectDictLabel(String plabel){ - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("plabel",plabel); - DictTypeDO dictTypeDO = dictTypeMapper.selectOne(queryWrapper); - if(dictTypeDO != null && 0 == dictTypeDO.getStatus()){ - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("label",plabel); - DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1); - if(dictDataDO != null && 0 == dictDataDO.getStatus()){ - return dictDataDO; - }else { - throw new UtilException( "未查到字典相关标签"); - } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("label",plabel); + DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1); + if(dictDataDO != null && 0 == dictDataDO.getStatus()){ + return dictDataDO; }else { - throw new UtilException( "字典标签" + plabel + "无效"); + throw new UtilException( "未查到字典相关标签"); } } - }