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 10f3529f00..efdf9eb049 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 @@ -187,6 +187,11 @@ public class XpackShareManage { public IPage query(int pageNum, int pageSize, VisualizationWorkbranchQueryRequest request) { 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()); + }); + } IPage ipage = new Page<>(); ipage.setSize(poiPage.getSize()); ipage.setCurrent(poiPage.getCurrent()); 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 a7cbc2028c..059883fea9 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 @@ -531,8 +531,8 @@ public class DataVisualizationServer implements DataVisualizationApi { 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() : "管理员"); + item.setCreator(StringUtils.equals(item.getCreator(), "1") ? "管理员" : item.getCreator()); + item.setLastEditor(StringUtils.equals(item.getLastEditor(), "1") ? "管理员" : 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 16beb758d1..59b551a287 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 @@ -33,8 +33,8 @@ public class VisualizationStoreServer implements VisualizationStoreApi { 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.getLastEditor() : "管理员"); + item.setCreator(StringUtils.equals(item.getCreator(), "1") ? "管理员" : item.getCreator()); + item.setLastEditor(StringUtils.equals(item.getLastEditor(), "1") ? "管理员" : item.getCreator()); }); } return iPage.getRecords();