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

---
 .../service/impl/LawsDataCenterFileServiceImpl.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 37c89aed..38813d97 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
@@ -82,12 +82,13 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 		queryWrapper.eq(StringUtils.isNotBlank(lawsDataCenterFile.getFolderId()), "folder_id", lawsDataCenterFile.getFolderId());
 		List<String> adminRoleCodeList = Arrays.asList(adminRoleCode.split(","));
 		Collection<String> intersection = CollectionUtils.intersection(Arrays.asList(CurrentUserUtil.getRoles().split(",")), adminRoleCodeList);
+		String userId = CurrentUserUtil.getId();
 		if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)) {
 			queryWrapper.and(qw -> qw
-					.eq("owner_id", CurrentUserUtil.getId())
-					.or().like("auth_view_ids", CurrentUserUtil.getId())
-					.or().like("auth_manage_ids", CurrentUserUtil.getId())
-					.or().like("push_range_ids", CurrentUserUtil.getId())
+					.eq("owner_id", userId)
+					.or().like("auth_view_ids", userId)
+					.or().like("auth_manage_ids", userId)
+					.or().like("push_range_ids", userId)
 					.or().eq("default_folder", YesOrNoEnum.YES.getValue())
 			);
 		}
@@ -97,7 +98,8 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 			for (LawsDataCenterFile file : result.getRecords()) {
 				// 管理权限标识
 				String authManageIds = file.getAuthManageIds();
-				if (StringUtils.isBlank(authManageIds) || !authManageIds.contains(CurrentUserUtil.getId())){
+				if (!userId.equals(file.getOwnerId())
+						&& (StringUtils.isBlank(authManageIds) || !authManageIds.contains(userId))){
 					file.setAuthManageTag(false);
 				}
 			}