diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java index 6a5b976d..89c9ef63 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java @@ -37,7 +37,7 @@ public class ResultCommon { public static final String NO_PERMISSION = "message.no.permission"; // 没有数据操作权限 public static final String SELECT_DATA = "message.select.data"; // 请选择数据 public static final String EXIST_SUB_FOLDERS = "message.exist.sub.folders"; // 文件夹下有子文件夹 ，该文件夹不允许删除 - + public static final String EXIST_SUB_FILES = "message.exist.sub.files"; // 文件夹下有文件不能删除 public static final String RMR_SET_QUALITY_OVER_TEN = "es.rmr.setQuality.overTen"; // 请最多选择10条 public static final String SUCCESSFULLY_CLEARED = "successfully.cleared"; // 清除成功 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java index 94f68b35..0ab2e48c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java @@ -2,8 +2,10 @@ package com.jero.modules.laws.dataCenter.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.modules.laws.common.constant.FieldCommon; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.ResultCommon; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.common.util.TreeNodeComparator; import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; @@ -16,13 +18,13 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 资料中心-文件夹 @@ -164,6 +166,13 @@ public class LawsDataCenterFolderServiceImpl extends ServiceImpl() + .eq(LawsDataCenterFile::getFolderId, id)); + if (count > 0){ + throw new JeroBootException(ResultCommon.EXIST_SUB_FILES); + } + // 只剩一个文件夹也不能删除 LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(LawsDataCenterFolder::getParentId, "0"); @@ -174,10 +183,12 @@ public class LawsDataCenterFolderServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(LawsDataCenterFile::getFolderId, null); - updateWrapper.eq(LawsDataCenterFile::getFolderId, id); - lawsDataCenterFileService.update(updateWrapper); + /** + * // 将该文件夹下面的文件夹关联删除 + * LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + * updateWrapper.set(LawsDataCenterFile::getFolderId, null); + * updateWrapper.eq(LawsDataCenterFile::getFolderId, id); + * lawsDataCenterFileService.update(updateWrapper); + */ } } diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index ccca5631..ff6a689c 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -13,6 +13,7 @@ message.no.exists.param=param {0} not exists message.no.permission=No data operation permission message.select.data=Please select data message.exist.sub.folders=There are sub folders in the folder. The folder cannot be deleted +message.exist.sub.files=Files in the folder cannot be deleted successfully.cleared=successfully cleared successfully.deleted=successfully deleted diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index 28f7db6f..847055fd 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -12,6 +12,7 @@ message.no.exists.param=param {0} not exists message.no.permission=No data operation permission message.select.data=Please select data message.exist.sub.folders=There are sub folders in the folder. The folder cannot be deleted +message.exist.sub.files=Files in the folder cannot be deleted es.rmr.setQuality.overTen=Please select up to 10 diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index ab336117..d2190382 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -13,6 +13,7 @@ message.no.exists.param=\u53C2\u6570{0}\u4E0D\u5B58\u5728 message.no.permission=\u6CA1\u6709\u6570\u636E\u64CD\u4F5C\u6743\u9650 message.select.data=\u8BF7\u9009\u62E9\u6570\u636E message.exist.sub.folders=\u6587\u4EF6\u5939\u4E0B\u6709\u5B50\u6587\u4EF6\u5939 \uFF0C\u8BE5\u6587\u4EF6\u5939\u4E0D\u5141\u8BB8\u5220\u9664 +message.exist.sub.files=\u6587\u4EF6\u5939\u4E0B\u6709\u6587\u4EF6\u4E0D\u80FD\u5220\u9664 successfully.cleared=\u6E05\u9664\u6210\u529F successfully.deleted=\u5220\u9664\u6210\u529F