center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 大屏删除文件夹兼容脏数据

Browse Source
This commit is contained in:
fit2cloud-chenyw 2023-10-25 11:39:37 +08:00
parent dc09137d95
commit a17641c7b6
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java
View File

@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.dataease.api.visualization.request.DataVisualizationBaseRequest; import io.dataease.api.visualization.request.DataVisualizationBaseRequest;
import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest; import io.dataease.api.visualization.request.VisualizationWorkbranchQueryRequest;
import io.dataease.api.visualization.vo.VisualizationResourceVO; import io.dataease.api.visualization.vo.VisualizationResourceVO;
import io.dataease.api.visualization.vo.VisualizationStoreVO;
import io.dataease.commons.constants.DataVisualizationConstants; import io.dataease.commons.constants.DataVisualizationConstants;
import io.dataease.commons.constants.OptConstants; import io.dataease.commons.constants.OptConstants;
import io.dataease.constant.BusiResourceEnum; import io.dataease.constant.BusiResourceEnum;
@ -21,7 +20,6 @@ import io.dataease.visualization.dao.auto.entity.DataVisualizationInfo;
import io.dataease.visualization.dao.auto.mapper.DataVisualizationInfoMapper; import io.dataease.visualization.dao.auto.mapper.DataVisualizationInfoMapper;
import io.dataease.visualization.dao.ext.mapper.CoreVisualiationExtMapper; import io.dataease.visualization.dao.ext.mapper.CoreVisualiationExtMapper;
import io.dataease.visualization.dao.ext.mapper.ExtDataVisualizationMapper; import io.dataease.visualization.dao.ext.mapper.ExtDataVisualizationMapper;
import io.dataease.visualization.dao.ext.po.StorePO;
import io.dataease.visualization.dao.ext.po.VisualizationNodePO; import io.dataease.visualization.dao.ext.po.VisualizationNodePO;
import io.dataease.visualization.dao.ext.po.VisualizationResourcePO; import io.dataease.visualization.dao.ext.po.VisualizationResourcePO;
import io.dataease.visualization.dto.VisualizationNodeBO; import io.dataease.visualization.dto.VisualizationNodeBO;
@ -30,7 +28,6 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.*; import java.util.*;
@ -84,7 +81,11 @@ public class CoreVisualizationManage {
delIds.add(tempPid); delIds.add(tempPid);
List<Long> childrenIdList = extMapper.queryChildrenId(tempPid); List<Long> childrenIdList = extMapper.queryChildrenId(tempPid);
if (CollectionUtil.isNotEmpty(childrenIdList)) { if (CollectionUtil.isNotEmpty(childrenIdList)) {
stack.addAll(childrenIdList); childrenIdList.forEach(kid -> {
if (!delIds.contains(kid)) {
stack.add(kid);
}
});
} }
} }
extMapper.batchDel(delIds, System.currentTimeMillis(), AuthUtils.getUser().getUserId()); extMapper.batchDel(delIds, System.currentTimeMillis(), AuthUtils.getUser().getUserId());