From dc56e211e698c0375aafc0c366c9ac922546d309 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: Tue, 18 Oct 2022 18:04:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=BF=AE=E6=AD=A3Excel=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=AD=97=E5=85=B8=E5=80=BC=E8=BD=AC=E6=8D=A2=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=94=B1=E4=BA=8E=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=B8=8D=E7=94=9F=E6=95=88=20bug=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 2d589e5b3..c7dc8d627 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -16,6 +16,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StreamUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.redis.CacheUtils; +import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictTypeMapper; import com.ruoyi.system.service.ISysDictTypeService; @@ -233,7 +234,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService @Override public String getDictLabel(String dictType, String dictValue, String separator) { StringBuilder propertyString = new StringBuilder(); - List datas = selectDictDataByType(dictType); + List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) { for (SysDictData dict : datas) { @@ -265,7 +266,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService @Override public String getDictValue(String dictType, String dictLabel, String separator) { StringBuilder propertyString = new StringBuilder(); - List datas = selectDictDataByType(dictType); + List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) { for (SysDictData dict : datas) { From cb61a84acbe4fd6b63fe51180c07b9e9fff787af Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: Wed, 19 Oct 2022 09:06:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E4=BF=AE=E6=AD=A3=20SysConfig,=20Sys?= =?UTF-8?q?Oss=20=E6=96=B9=E6=B3=95=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=BC=93=E5=AD=98=E4=B8=8D=E7=94=9F=E6=95=88?= =?UTF-8?q?=20bug=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 5 +++-- .../com/ruoyi/system/service/impl/SysOssServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index da0ee394f..72dc42bb4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -13,6 +13,7 @@ import com.ruoyi.common.core.service.ConfigService; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.redis.CacheUtils; +import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper; import com.ruoyi.system.service.ISysConfigService; @@ -85,7 +86,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { */ @Override public boolean selectCaptchaEnabled() { - String captchaEnabled = selectConfigByKey("sys.account.captchaEnabled"); + String captchaEnabled = SpringUtils.getAopProxy(this).selectConfigByKey("sys.account.captchaEnabled"); if (StringUtils.isEmpty(captchaEnabled)) { return true; } @@ -216,7 +217,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { */ @Override public String getConfigValue(String configKey) { - return selectConfigByKey(configKey); + return SpringUtils.getAopProxy(this).selectConfigByKey(configKey); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java index 514e68efb..6c63821f1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.oss.core.OssClient; import com.ruoyi.oss.entity.UploadResult; import com.ruoyi.oss.factory.OssFactory; @@ -50,7 +51,7 @@ public class SysOssServiceImpl implements ISysOssService { public List listByIds(Collection ossIds) { List list = new ArrayList<>(); for (Long id : ossIds) { - SysOssVo vo = getById(id); + SysOssVo vo = SpringUtils.getAopProxy(this).getById(id); if (ObjectUtil.isNotNull(vo)) { list.add(vo); }