diff --git a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java index 5cdeb14057..bf4cfc80ec 100644 --- a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java +++ b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java @@ -15,6 +15,7 @@ import io.dataease.auth.bo.TokenUserBO; import io.dataease.constant.AuthConstant; import io.dataease.constant.BusiResourceEnum; import io.dataease.exception.DEException; +import io.dataease.i18n.Translator; import io.dataease.license.config.XpackInteract; import io.dataease.license.utils.LicenseUtil; import io.dataease.share.dao.auto.entity.XpackShare; @@ -188,8 +189,8 @@ public class XpackShareManage { IPage poiPage = proxy().querySharePage(pageNum, pageSize, request); List vos = proxy().formatResult(poiPage.getRecords()); if (!org.springframework.util.CollectionUtils.isEmpty(vos)) { - vos.stream().forEach(item -> { - item.setCreator(StringUtils.equals(item.getCreator(), "1") ? "管理员" : item.getCreator()); + vos.forEach(item -> { + item.setCreator(StringUtils.equals(item.getCreator(), "1") ? Translator.get("i18n_sys_admin") : item.getCreator()); }); } IPage ipage = new Page<>(); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 41a841ef4c..0b14481380 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -574,9 +574,9 @@ public class DataVisualizationServer implements DataVisualizationApi { IPage result = coreVisualizationManage.query(1, 20, request); List resourceVOS = result.getRecords(); if (!CollectionUtils.isEmpty(resourceVOS)) { - resourceVOS.stream().forEach(item -> { - item.setCreator(StringUtils.equals(item.getCreator(), "1") ? "管理员" : item.getCreator()); - item.setLastEditor(StringUtils.equals(item.getLastEditor(), "1") ? "管理员" : item.getLastEditor()); + resourceVOS.forEach(item -> { + item.setCreator(StringUtils.equals(item.getCreator(), "1") ? Translator.get("i18n_sys_admin") : item.getCreator()); + item.setLastEditor(StringUtils.equals(item.getLastEditor(), "1") ? Translator.get("i18n_sys_admin") : item.getLastEditor()); }); } return result.getRecords(); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationStoreServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationStoreServer.java index 59b551a287..a055d63eca 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationStoreServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationStoreServer.java @@ -6,6 +6,7 @@ import io.dataease.api.visualization.request.VisualizationStoreRequest; import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; import io.dataease.api.visualization.vo.VisualizationResourceVO; import io.dataease.api.visualization.vo.VisualizationStoreVO; +import io.dataease.i18n.Translator; import io.dataease.visualization.manage.VisualizationStoreManage; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; @@ -32,9 +33,9 @@ public class VisualizationStoreServer implements VisualizationStoreApi { IPage iPage = visualizationStoreManage.query(1, 20, request); List resourceVOS = iPage.getRecords(); if (!CollectionUtils.isEmpty(resourceVOS)) { - resourceVOS.stream().forEach(item -> { - item.setCreator(StringUtils.equals(item.getCreator(), "1") ? "管理员" : item.getCreator()); - item.setLastEditor(StringUtils.equals(item.getLastEditor(), "1") ? "管理员" : item.getCreator()); + resourceVOS.forEach(item -> { + item.setCreator(StringUtils.equals(item.getCreator(), "1") ? Translator.get("i18n_sys_admin") : item.getCreator()); + item.setLastEditor(StringUtils.equals(item.getLastEditor(), "1") ? Translator.get("i18n_sys_admin") : item.getCreator()); }); } return iPage.getRecords();