From fa749ed95112ea9d5e1c99af464ee6734b10496d Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 29 Jul 2024 11:57:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(87643):=20=E8=B5=84=E6=96=99=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E6=9C=89=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=9A=84=E4=BA=BA=E5=AF=B9=E6=96=87=E4=BB=B6=E5=A4=B9=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA=E6=97=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsDataCenterFileServiceImpl.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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 85903ee2..1bd031f6 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 @@ -1,5 +1,6 @@ package com.jero.modules.laws.dataCenter.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,11 +16,14 @@ import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.common.util.DateUtil; +import com.jero.modules.laws.dataCenter.common.DataCenterCommon; import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFolder; +import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFolderSublist; import com.jero.modules.laws.dataCenter.mapper.LawsDataCenterFileMapper; import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService; import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFolderService; +import com.jero.modules.laws.dataCenter.service.LawsDataCenterFolderSublistService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.spire.ms.System.Collections.ArrayList; @@ -33,6 +37,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** @@ -54,6 +59,8 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl getAuthManageList = lawsDataCenterFolderSublistService.list( + new LambdaQueryWrapper() + .eq(LawsDataCenterFolderSublist::getDataCenterFolderId, file.getFolderId()) + .eq(LawsDataCenterFolderSublist::getType, DataCenterCommon.AUTH_MANAGE)); + String userIds = getAuthManageList.stream() + .map(LawsDataCenterFolderSublist::getUserId) + .collect(Collectors.joining(",")); if (!CurrentUserUtil.getId().equals(folder.getOwnerId()) && - (StringUtils.isBlank(folder.getAuthManageIds()) || !folder.getAuthManageIds().contains(CurrentUserUtil.getId()))) { + (StringUtils.isBlank(userIds) || !userIds.contains(CurrentUserUtil.getId()))) { throw new JeroBootException(ResultCommon.NO_PERMISSION); } }