Merge remote-tracking branch 'origin/wzj-main' into wzj-main

fix(system):修复租户字典数据同步空列表异常
- 在SysTenantServiceImpl中增加空列表检查
- 避免当dataList为空时出现空指针异常

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,

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

@@ -678,6 +678,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
                 if (typeList.contains(dictType.getDictType())) {
                     List<SysDictData> dataListTenant = typeDataMap.get(tenantId).get(dictType.getDictType());
                     Map<String, SysDictData> map = StreamUtils.toIdentityMap(dataListTenant, SysDictData::getDictValue);
+                    if (CollUtil.isNotEmpty(dataList)) {
                         for (SysDictData dictData : dataList) {
                             if (!map.containsKey(dictData.getDictValue())) {
                                 SysDictData data = BeanUtil.toBean(dictData, SysDictData.class);
@@ -693,6 +694,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
                                 saveDataList.add(data);
                             }
                         }
+                    }
                 } else {
                     SysDictType type = BeanUtil.toBean(dictType, SysDictType.class);
                     type.setDictId(null);