From b311ba2c11faa2f259ef421faf3a5313451e105f Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Fri, 7 Mar 2025 14:12:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../industry/software/manage/pojo/other/FileInfoVO.java      | 2 ++
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java    | 5 ++---
 .../src/main/resources/sqlmapper/EdFileInfoMapper.xml        | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java
index bb7098c..ff74225 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java
@@ -49,6 +49,8 @@ public class FileInfoVO {
 
     private List<FileTagInfo> labels;
 
+    private Integer prjDir;
+
     // 是否是收藏数据，1是，0否
     private Integer isFavorite;
 
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index a41dad8..7007b93 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -158,7 +158,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         records.forEach(e -> {
             e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
             e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0);
-            e.setIsPersonal(dataOwnCode == DataOwnEnum.USER_FILE.code ? 1 : 0);
             e.setLabels(fileTagRelationService.getFileTags(e.getId()));
         });
         UserThreadLocal.setSuccessInfo("", "", "查询文件成功");
@@ -1430,11 +1429,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         fileInfoVOIPage.getRecords().forEach(e -> {
             e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
             e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0);
-            e.setIsPersonal(Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId()) ? 1 : 0);
+            e.setIsPersonal( (e.getPrjDir()== DataOwnEnum.USER_FILE.code && Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId())) ? 1 : 0);
             // 设置权限
             Map<String, Boolean> permissions = (e.getIsPersonal() == 1)
                     ? permissionService.getPersonalPermission()
-                    : permissionService.getUserPermission(UserThreadLocal.getUserId(), e.getId(), true);
+                    : permissionService.getUserPermission(UserThreadLocal.getUserId(), getCategoryId(e.getId()), true);
             e.setPermissions(permissions);
         });
         UserThreadLocal.setSuccessInfo("", "", "查询了收藏列表");
diff --git a/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml
index b1aadb0..181fdc9 100644
--- a/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml
+++ b/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml
@@ -13,6 +13,7 @@
         <result column="parent_id" property="parentId"/>
         <result column="category_id" property="categoryId"/>
         <result column="data_type" property="dataType"/>
+        <result column="prj_dir" property="prjDir"/>
         <result column="data_status" property="dataStatus"/>
         <result column="save_status" property="saveStatus"/>
         <result column="file_size" property="fileSize"/>