test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 修复文件管理中针对跟目录id的判断方法

This commit is contained in:
song-tianyang 2023-11-20 16:26:07 +08:00 committed by 建国
parent 314a6fbfd4
commit 467942fc59
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/project-management/src/main/java/io/metersphere/project/service/FileModuleService.java
View File

@ -94,7 +94,7 @@ public class FileModuleService extends ModuleTreeService implements CleanupProje
*/ */
protected void checkDataValidity(FileModule fileModule) { protected void checkDataValidity(FileModule fileModule) {
FileModuleExample example = new FileModuleExample(); FileModuleExample example = new FileModuleExample();
if (!StringUtils.equals(fileModule.getParentId(), ModuleConstants.ROOT_NODE_PARENT_ID)) { if (!StringUtils.equalsIgnoreCase(fileModule.getParentId(), ModuleConstants.ROOT_NODE_PARENT_ID)) {
//检查父ID是否存在 //检查父ID是否存在
example.createCriteria().andIdEqualTo(fileModule.getParentId()); example.createCriteria().andIdEqualTo(fileModule.getParentId());
if (fileModuleMapper.countByExample(example) == 0) { if (fileModuleMapper.countByExample(example) == 0) {

2
backend/services/project-management/src/main/java/io/metersphere/project/service/ModuleTreeService.java
View File

@ -59,7 +59,7 @@ public abstract class ModuleTreeService {
while (CollectionUtils.isNotEmpty(traverseList) && traverseList.size() != lastSize) { while (CollectionUtils.isNotEmpty(traverseList) && traverseList.size() != lastSize) {
List<BaseTreeNode> notMatchedList = new ArrayList<>(); List<BaseTreeNode> notMatchedList = new ArrayList<>();
for (BaseTreeNode treeNode : traverseList) { for (BaseTreeNode treeNode : traverseList) {
if (StringUtils.equals(treeNode.getParentId(), ModuleConstants.ROOT_NODE_PARENT_ID)) { if (StringUtils.equalsIgnoreCase(treeNode.getParentId(), ModuleConstants.ROOT_NODE_PARENT_ID)) {
BaseTreeNode node = new BaseTreeNode(treeNode.getId(), treeNode.getName(), treeNode.getType(), treeNode.getParentId()); BaseTreeNode node = new BaseTreeNode(treeNode.getId(), treeNode.getName(), treeNode.getType(), treeNode.getParentId());
baseTreeNodeList.add(node); baseTreeNodeList.add(node);
baseTreeNodeMap.put(treeNode.getId(), node); baseTreeNodeMap.put(treeNode.getId(), node);