guoxin
/
shandan
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
GuoXin 1 year ago
parent c923b6b77a 83282ad949
commit 3e6c019881
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      shandan-system/src/main/java/com/keyware/shandan/bianmu/service/impl/DirectoryServiceImpl.java

4
shandan-system/src/main/java/com/keyware/shandan/bianmu/service/impl/DirectoryServiceImpl.java
Unescape View File

@ -82,12 +82,12 @@ public class DirectoryServiceImpl extends BaseServiceImpl<DirectoryMapper, Direc
QueryWrapper<DirectoryVo> deleteByResourceIdsQuery = new QueryWrapper<DirectoryVo>(); QueryWrapper<DirectoryVo> deleteByResourceIdsQuery = new QueryWrapper<DirectoryVo>();
removeList.forEach(dir -> { removeList.forEach(dir -> {
if (dir.getDirectoryType() == DirectoryType.FILE) { if (dir.getDirectoryType() == DirectoryType.FILE) {
if (countByDirTypeAndResource(DirectoryType.FILE, dir.getResourceId()) == 0) { if (countByDirTypeAndResource(DirectoryType.FILE, dir.getResourceId()) <= 1) {
deleteByDirectoryIdAndResourceId(null, dir.getResourceId()); deleteByDirectoryIdAndResourceId(null, dir.getResourceId());
sysFileService.deleteById(dir.getResourceId()); sysFileService.deleteById(dir.getResourceId());
} }
} else if (dir.getDirectoryType() == DirectoryType.METADATA) { } else if (dir.getDirectoryType() == DirectoryType.METADATA) {
if (countByDirTypeAndResource(DirectoryType.METADATA, dir.getResourceId()) == 0) { if (countByDirTypeAndResource(DirectoryType.METADATA, dir.getResourceId()) <= 1) {
deleteByDirectoryIdAndResourceId(null, dir.getResourceId()); deleteByDirectoryIdAndResourceId(null, dir.getResourceId());
} }
} }