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 fd27afc8..7d558090 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 @@ -21,16 +21,15 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.spire.ms.System.Collections.ArrayList; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -52,6 +51,9 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl adminRoleCodeList = Arrays.asList(adminRoleCode.split(",")); + Collection intersection = CollectionUtils.intersection(Arrays.asList(CurrentUserUtil.getRoles().split(",")), adminRoleCodeList); + 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()) @@ -85,7 +89,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl result = lawsDataCenterFileMapper.queryByPage(page, queryWrapper); - if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN)){ + if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)){ for (LawsDataCenterFile file : result.getRecords()) { // 管理权限标识 String authManageIds = file.getAuthManageIds(); @@ -143,7 +147,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl sendMap = new HashMap<>(); sendMap.put("fileName", String.join(",", fileNameList)); sendMap.put("fileDescription", StringUtils.isBlank(lawsDataCenterFile.getFileDescription()) ? "" : lawsDataCenterFile.getFileDescription()); - sendMap.put("uploader", lawsDataCenterFile.getUploader()); + sendMap.put(UPLOADER, lawsDataCenterFile.getUploader()); sendMessageDTO.setMap(sendMap); sendMessageAPI.sendMessage(sendMessageDTO); } @@ -214,7 +218,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl sendMap = new HashMap<>(); sendMap.put("fileName", lawsDataCenterFile.getFileName()); sendMap.put("fileDescription", StringUtils.isBlank(lawsDataCenterFile.getFileDescription()) ? "" : lawsDataCenterFile.getFileDescription()); - sendMap.put("uploader", dataCenterFile.getUploader()); + sendMap.put(UPLOADER, dataCenterFile.getUploader()); sendMessageDTO.setMap(sendMap); sendMessageAPI.sendMessage(sendMessageDTO); }