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

@@ -7,7 +7,7 @@
              v.member_id,
              m.avatar,
              m.nickname,
-             m.phone_hidden as phone,
+             m.phone_encrypted 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,21 +678,19 @@ 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) {
-                        for (SysDictData dictData : dataList) {
+                        if (!map.containsKey(dictData.getDictValue())) {
-                            if (!map.containsKey(dictData.getDictValue())) {
+                            SysDictData data = BeanUtil.toBean(dictData, SysDictData.class);
-                                SysDictData data = BeanUtil.toBean(dictData, SysDictData.class);
+                            // 设置字典编码为 null
-                                // 设置字典编码为 null
+                            data.setDictCode(null);
-                                data.setDictCode(null);
+                            data.setTenantId(tenantId);
-                                data.setTenantId(tenantId);
+                            data.setCreateTime(null);
-                                data.setCreateTime(null);
+                            data.setUpdateTime(null);
-                                data.setUpdateTime(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 {