abu/wzj-boot
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(content): 取用户手机号码字段修正

Browse Source 
fix(system):修复租户字典数据同步空列表异常
- 在SysTenantServiceImpl中增加空列表检查
- 避免当dataList为空时出现空指针异常
This commit is contained in:
huk 2025-09-30 10:04:04 +08:00
parent 4ee40f0bdb
commit ddcb00102c
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml
View File

@ -7,7 +7,7 @@
v.member_id, v.member_id,
m.avatar, m.avatar,
m.nickname, m.nickname,
m.phone_encrypted as phone, m.phone_hidden as phone,
v.create_time, v.create_time,
v.title as content, v.title as content,
v.url as url, v.url as url,

26
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
View File

@ -678,19 +678,21 @@ public class SysTenantServiceImpl implements ISysTenantService {
if (typeList.contains(dictType.getDictType())) { if (typeList.contains(dictType.getDictType())) {
List<SysDictData> dataListTenant = typeDataMap.get(tenantId).get(dictType.getDictType()); List<SysDictData> dataListTenant = typeDataMap.get(tenantId).get(dictType.getDictType());
Map<String, SysDictData> map = StreamUtils.toIdentityMap(dataListTenant, SysDictData::getDictValue); Map<String, SysDictData> map = StreamUtils.toIdentityMap(dataListTenant, SysDictData::getDictValue);
for (SysDictData dictData : dataList) { if (CollUtil.isNotEmpty(dataList)) {
if (!map.containsKey(dictData.getDictValue())) { for (SysDictData dictData : dataList) {
SysDictData data = BeanUtil.toBean(dictData, SysDictData.class); if (!map.containsKey(dictData.getDictValue())) {
// 设置字典编码为 null SysDictData data = BeanUtil.toBean(dictData, SysDictData.class);
data.setDictCode(null); // 设置字典编码为 null
data.setTenantId(tenantId); data.setDictCode(null);
data.setCreateTime(null); data.setTenantId(tenantId);
data.setUpdateTime(null); data.setCreateTime(null);
data.setUpdateTime(null);
// data.setCreateDept(null); // data.setCreateDept(null);
data.setCreateBy(null); data.setCreateBy(null);
data.setUpdateBy(null); data.setUpdateBy(null);
set.add(tenantId); set.add(tenantId);
saveDataList.add(data); saveDataList.add(data);
}
} }
} }
} else { } else {