From 0badec2c0051febdd19d578abf686e31ca36c6aa Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: Tue, 18 Oct 2022 18:42:01 +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 --- .../java/com/ruoyi/system/dubbo/RemoteDictServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteDictServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteDictServiceImpl.java index 0b3441dd..2ed7787f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteDictServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dubbo/RemoteDictServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.system.dubbo; import cn.hutool.core.collection.CollUtil; +import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.RemoteDictService; import com.ruoyi.system.api.domain.SysDictData; @@ -27,7 +28,7 @@ public class RemoteDictServiceImpl implements RemoteDictService { @Override public String getDictLabel(String dictType, String dictValue, String separator) { StringBuilder propertyString = new StringBuilder(); - List datas = sysDictTypeService.selectDictDataByType(dictType); + List datas = SpringUtils.getAopProxy(sysDictTypeService).selectDictDataByType(dictType); if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) { for (SysDictData dict : datas) { @@ -51,7 +52,7 @@ public class RemoteDictServiceImpl implements RemoteDictService { @Override public String getDictValue(String dictType, String dictLabel, String separator) { StringBuilder propertyString = new StringBuilder(); - List datas = sysDictTypeService.selectDictDataByType(dictType); + List datas = SpringUtils.getAopProxy(sysDictTypeService).selectDictDataByType(dictType); if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) { for (SysDictData dict : datas) { From 6f97b5a655cee9fedc05ef27a0a6e01973e47106 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: Wed, 19 Oct 2022 09:11:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E4=BF=AE=E6=AD=A3=20SysOss=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=BC=93=E5=AD=98=E4=B8=8D=E7=94=9F=E6=95=88=20bug=20?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/resource/service/impl/SysOssServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/impl/SysOssServiceImpl.java index 72fc713c..b655ae7a 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/impl/SysOssServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; import com.ruoyi.common.mybatis.core.page.TableDataInfo; @@ -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); }