public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13711 from dataease/pr@dev-v2@fix_workbranch

Browse Source 
fix(工作台): 修复社区版最近使用资源不显示创建人名称，显示的是id问题
This commit is contained in:
王嘉豪
2024-12-01 20:54:12 +08:00
committed by GitHub
parent 976195fab6 1e15529525
commit cfdde72ec1
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java
View File

@@ -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<StorePO> query(IPage<StorePO> page, @Param("ew") QueryWrapper<Object> ew);

1
core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java
View File

@@ -97,6 +97,7 @@ public class VisualizationStoreManage {
Long uid = AuthUtils.getUser().getUserId();
QueryWrapper<Object> 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)) {

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

@@ -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<VisualizationResourceVO> findRecent(@RequestBody VisualizationWorkbranchQueryRequest request) {
request.setQueryFrom("recent");
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():"管理员");
});
}
return result.getRecords();
}

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

@@ -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<VisualizationStoreVO> query(VisualizationWorkbranchQueryRequest request) {
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.getLastEditor() : "管理员");
});
}
return iPage.getRecords();
}