chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复发现的bug

This commit is contained in:
chenxudong 2024-12-31 14:28:27 +08:00
parent 22e92702d1
commit 895bbfc600
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -224,7 +224,9 @@ public class CommonService {
for (String id : ids) { for (String id : ids) {
List<EdFileInfo> edFileInfos = selectAllAdminFolder(id); List<EdFileInfo> edFileInfos = selectAllAdminFolder(id);
if (!isAdminQuery) {
edFileInfos = edFileInfos.stream().filter(e -> e.getDataStatus().equals(EleDataStatusEnum.PUBLISHED.code)).collect(Collectors.toList());
}
// 转换为树 // 转换为树
TreeNodeConfig config = new TreeNodeConfig(); TreeNodeConfig config = new TreeNodeConfig();
config.setIdKey(EdFileInfo.Fields.id); config.setIdKey(EdFileInfo.Fields.id);

5
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
View File

@ -393,11 +393,6 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
String parentId = this.baseMapper.selectById(id).getParentId(); String parentId = this.baseMapper.selectById(id).getParentId();
// 首先检查同层是否有同名目录 // 首先检查同层是否有同名目录
Assert.isTrue(commonService.notExistSameFolder(parentId, newFolderName)); Assert.isTrue(commonService.notExistSameFolder(parentId, newFolderName));
// if (commonService.notExistSameFolder(parentId, newFolderName)) {
// String info = "存在同名子集，禁止修改";
// log.error(info);
// return ElectromagneticResultUtil.fail("-1", info);
// }
String currentUserId = UserThreadLocal.getUserId(); String currentUserId = UserThreadLocal.getUserId();
Date now = new Date(); Date now = new Date();
EdFileInfo fileInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class) EdFileInfo fileInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class)