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

---
 .../dataCenter/entity/LawsDataCenterFile.java   | 17 +++++++++--------
 .../impl/LawsDataCenterFileServiceImpl.java     | 15 ++++++++++++++-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java
index 55bf2297..1f0d5cb1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java
@@ -1,26 +1,22 @@
 package com.jero.modules.laws.dataCenter.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 
 
 /**
@@ -103,4 +99,9 @@ public class LawsDataCenterFile implements Serializable {
     @ApiModelProperty(value = "上传时间（逗号分隔）")
     @TableField(exist = false)
     private java.lang.String uploadTime;
+
+    /**管理权限标识*/
+    @ApiModelProperty(value = "管理权限标识（true:有管理权限 false:没有管理权限）")
+    @TableField(exist = false)
+    private boolean authManageTag = true;
 }
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 d375c62b..c9893a2a 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
@@ -75,7 +75,20 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 			);
 		}
 		queryWrapper.orderByDesc(LawsDataCenterFile::getCreateTime);
-        return page(page, queryWrapper);
+		Page<LawsDataCenterFile> result = page(page, queryWrapper);
+		if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN)){
+			for (LawsDataCenterFile file : result.getRecords()) {
+				// 管理权限标识
+				if (StringUtils.isNotBlank(file.getFolderId())) {
+					LawsDataCenterFolder lawsDataCenterFolder = lawsDataCenterFolderService.getById(file.getFolderId());
+					String authManageIds = lawsDataCenterFolder.getAuthManageIds();
+					if (StringUtils.isBlank(authManageIds) || !authManageIds.contains(CurrentUserUtil.getId())) {
+						file.setAuthManageTag(false);
+					}
+				}
+			}
+		}
+		return result;
     }
 
 	/**