github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(工作台): 最近使用、我的收藏、我的分享列表内管理员名称支持国际化

Browse Source
This commit is contained in:
ulleo 2024-12-24 14:42:14 +08:00 committed by fit2cloud-chenyw
parent f9661f235b
commit 57853fd89c
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java
View File

@ -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<XpackSharePO> poiPage = proxy().querySharePage(pageNum, pageSize, request);
List<XpackShareGridVO> 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<XpackShareGridVO> ipage = new Page<>();

6
core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
View File

@ -574,9 +574,9 @@ public class DataVisualizationServer implements DataVisualizationApi {
IPage<VisualizationResourceVO> result = coreVisualizationManage.query(1, 20, request);
List<VisualizationResourceVO> 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();

7
core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationStoreServer.java
View File

@ -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<VisualizationStoreVO> iPage = visualizationStoreManage.query(1, 20, request);
List<VisualizationStoreVO> 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();