From ddcb00102c23fcf8a693ed41931d8b90cae65b2a Mon Sep 17 00:00:00 2001 From: huk Date: Tue, 30 Sep 2025 10:04:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(content):=20=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20fix(system):=E4=BF=AE=E5=A4=8D=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E7=A9=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=BC=82=E5=B8=B8=20-=20=E5=9C=A8SysTenantSe?= =?UTF-8?q?rviceImpl=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=A9=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=20-=20=E9=81=BF=E5=85=8D=E5=BD=93dataList?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=87=BA=E7=8E=B0=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/content/VlogMapperCustom.xml | 2 +- .../service/impl/SysTenantServiceImpl.java | 26 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml index e6a3f27b4..3372191be 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml @@ -7,7 +7,7 @@ v.member_id, m.avatar, m.nickname, - m.phone_encrypted as phone, + m.phone_hidden as phone, v.create_time, v.title as content, v.url as url, diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 75d420827..311cdbb64 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -678,19 +678,21 @@ public class SysTenantServiceImpl implements ISysTenantService { if (typeList.contains(dictType.getDictType())) { List dataListTenant = typeDataMap.get(tenantId).get(dictType.getDictType()); Map map = StreamUtils.toIdentityMap(dataListTenant, SysDictData::getDictValue); - for (SysDictData dictData : dataList) { - if (!map.containsKey(dictData.getDictValue())) { - SysDictData data = BeanUtil.toBean(dictData, SysDictData.class); - // 设置字典编码为 null - data.setDictCode(null); - data.setTenantId(tenantId); - data.setCreateTime(null); - data.setUpdateTime(null); + if (CollUtil.isNotEmpty(dataList)) { + for (SysDictData dictData : dataList) { + if (!map.containsKey(dictData.getDictValue())) { + SysDictData data = BeanUtil.toBean(dictData, SysDictData.class); + // 设置字典编码为 null + data.setDictCode(null); + data.setTenantId(tenantId); + data.setCreateTime(null); + data.setUpdateTime(null); // data.setCreateDept(null); - data.setCreateBy(null); - data.setUpdateBy(null); - set.add(tenantId); - saveDataList.add(data); + data.setCreateBy(null); + data.setUpdateBy(null); + set.add(tenantId); + saveDataList.add(data); + } } } } else {