From f9dd312e4fea5276540309521ca8be4f560bf64c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 4 Dec 2024 12:13:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E7=89=88=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E4=BA=BA=E7=AD=89=E6=98=BE=E7=A4=BAID=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/share/manage/XpackShareManage.java | 5 +++++ .../visualization/server/DataVisualizationServer.java | 4 ++-- .../visualization/server/VisualizationStoreServer.java | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) 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();