From ae501481be06348d8d612fd8269ffcb6769f6356 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 5 Feb 2024 17:48:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83):=2081?=
 =?UTF-8?q?815?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsDataCenterFileController.java       |  4 ++--
 .../controller/LawsDataCenterFolderController.java     |  2 --
 .../service/impl/LawsDataCenterFileServiceImpl.java    | 10 +++++++---
 .../service/impl/LawsDataCenterFolderServiceImpl.java  |  3 +++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java
index ecd2350c..abe62d02 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java
@@ -113,7 +113,7 @@ public class LawsDataCenterFileController extends JeroController<LawsDataCenterF
         if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) {
             return Result.error("请选择数据!");
         }
-        lawsDataCenterFileService.isHorizontalOverstep(String.valueOf(map.containsKey("id")));
+        lawsDataCenterFileService.isHorizontalOverstep(String.valueOf(map.get("id")));
         lawsDataCenterFileService.deleteById(map.get("id"));
         return Result.OK(ResultCommon.OK);
     }
@@ -132,7 +132,7 @@ public class LawsDataCenterFileController extends JeroController<LawsDataCenterF
         if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) {
             return Result.error("请选择数据!");
         }
-        lawsDataCenterFileService.isHorizontalOverstep(String.valueOf(map.containsKey("ids")));
+        lawsDataCenterFileService.isHorizontalOverstep(String.valueOf(map.get("ids")));
         this.lawsDataCenterFileService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
         return Result.OK(ResultCommon.OK);
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFolderController.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFolderController.java
index 6531c7b8..10b3191e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFolderController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFolderController.java
@@ -55,8 +55,6 @@ public class LawsDataCenterFolderController extends JeroController<LawsDataCente
     @PostMapping(value = "/addBrother")
     @RequiresPermissions("profileCenter:addPeer")
     public Result<T> addBrother(@Validated @RequestBody LawsDataCenterFolder lawsDataCenterFolder) {
-        // 水平越权
-        lawsDataCenterFolderService.isHorizontalOverstep(lawsDataCenterFolder.getParentId());
         lawsDataCenterFolderService.add(lawsDataCenterFolder);
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
index 68b49b84..37c89aed 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.common.api.dto.message.SendMessageDTO;
 import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.api.vo.SendMessageAPI;
 import com.jero.common.constant.enums.LanguageEnum;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.common.constant.FieldCommon;
@@ -87,7 +88,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 					.or().like("auth_view_ids", CurrentUserUtil.getId())
 					.or().like("auth_manage_ids", CurrentUserUtil.getId())
 					.or().like("push_range_ids", CurrentUserUtil.getId())
-					.or().eq("default_folder", "1")
+					.or().eq("default_folder", YesOrNoEnum.YES.getValue())
 			);
 		}
 		queryWrapper.orderByDesc("create_time");
@@ -270,8 +271,10 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 
 	@Override
 	public void isHorizontalOverstep(String ids) {
+		if (StringUtils.isBlank(ids)){
+			return;
+		}
 		QueryWrapper<LawsDataCenterFile> queryWrapper = new QueryWrapper<>();
-
 		List<String> adminRoleCodeList = Arrays.asList(adminRoleCode.split(","));
 		Collection<String> intersection = CollectionUtils.intersection(Arrays.asList(CurrentUserUtil.getRoles().split(",")), adminRoleCodeList);
 		if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)) {
@@ -279,7 +282,8 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 					.eq("owner_id", CurrentUserUtil.getId())
 					.or().like("auth_view_ids", CurrentUserUtil.getId())
 					.or().like("auth_manage_ids", CurrentUserUtil.getId())
-					.or().eq("push_range_ids", CurrentUserUtil.getId())
+					.or().like("push_range_ids", CurrentUserUtil.getId())
+					.or().eq("default_folder", YesOrNoEnum.YES.getValue())
 			);
 		}else {
 			return;
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 1fff2794..23e5820f 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
@@ -233,6 +233,9 @@ public class LawsDataCenterFolderServiceImpl extends ServiceImpl<LawsDataCenterF
 
 	@Override
 	public void isHorizontalOverstep(String ids) {
+		if (StringUtils.isBlank(ids)){
+			return;
+		}
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String roleIds = loginUser.getRoleIds();
 		// 全部数据