From 1e1552952520361067547d503067273f0324ddb6 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Sun, 1 Dec 2024 20:53:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=A4=BE=E5=8C=BA=E7=89=88=E6=9C=80=E8=BF=91=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=B5=84=E6=BA=90=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E6=98=AFid=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/ext/mapper/CoreStoreExtMapper.java | 2 +- .../manage/VisualizationStoreManage.java | 1 + .../visualization/server/DataVisualizationServer.java | 8 ++++++++ .../server/VisualizationStoreServer.java | 11 +++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java index 8401dfc450..0f4c231f49 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java @@ -21,7 +21,7 @@ public interface CoreStoreExtMapper { v.name, v.mobile_layout as ext_flag from core_store s - left join data_visualization_info v on s.resource_id = v.id + inner join data_visualization_info v on s.resource_id = v.id ${ew.customSqlSegment} """) IPage query(IPage page, @Param("ew") QueryWrapper ew); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java index 6af3bf242a..f05aaacb63 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java @@ -97,6 +97,7 @@ public class VisualizationStoreManage { Long uid = AuthUtils.getUser().getUserId(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("s.uid", uid); + queryWrapper.isNotNull("s.resource_id"); if (StringUtils.isNotBlank(request.getType())) { BusiResourceEnum busiResourceEnum = BusiResourceEnum.valueOf(request.getType().toUpperCase()); if (ObjectUtils.isEmpty(busiResourceEnum)) { 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 0d15cef9f1..6b5d8f4fb4 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 @@ -59,6 +59,7 @@ import io.dataease.visualization.utils.VisualizationUtils; import jakarta.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -527,6 +528,13 @@ public class DataVisualizationServer implements DataVisualizationApi { public List findRecent(@RequestBody VisualizationWorkbranchQueryRequest request) { request.setQueryFrom("recent"); 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():"管理员"); + }); + } 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 f00011e925..16beb758d1 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 @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.dataease.api.visualization.VisualizationStoreApi; 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.visualization.manage.VisualizationStoreManage; import jakarta.annotation.Resource; +import org.apache.commons.lang3.StringUtils; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -18,6 +21,7 @@ public class VisualizationStoreServer implements VisualizationStoreApi { @Resource private VisualizationStoreManage visualizationStoreManage; + @Override public void execute(VisualizationStoreRequest request) { visualizationStoreManage.execute(request); @@ -26,6 +30,13 @@ public class VisualizationStoreServer implements VisualizationStoreApi { @Override public List query(VisualizationWorkbranchQueryRequest request) { 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.getLastEditor() : "管理员"); + }); + } return iPage.getRecords(); }