From f889a6a0734069426207e8171e613ef06a8d7f23 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Wed, 5 Feb 2025 16:41:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/controller/EdFileInfoController.java      | 4 ++--
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java
index 950fa6e..745893d 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java
@@ -121,13 +121,13 @@ public class EdFileInfoController {
         return edFileInfoService.uploadRecord(pageNum, pageSize);
     }
 
-//    @RequiredPermission(value = FilePermission.VIEW)
+    @RequiredPermission(value = FilePermission.VIEW)
     @RequestMapping(value = "/fileDetail", method = RequestMethod.GET)
     public ElectromagneticResult<?> detail(@RequestParam String id) {
         return edFileInfoService.detail(id);
     }
 
-//    @RequiredPermission(value = FilePermission.VIEW)
+    @RequiredPermission(value = FilePermission.VIEW)
     @RequestMapping(value = "/queryChildFolder", method = RequestMethod.GET)
     public ElectromagneticResult<?> queryChildFolder(@RequestParam String parentId) {
         return edFileInfoService.queryChildFolder(parentId);
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 6d69d52..2c25e83 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
@@ -1171,6 +1171,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         if(file.getId().length()<6){
             throw new StringIndexOutOfBoundsException("此文件的FILE_CODE小于六位："+id);
         }
+        if(file.getPrjDir().equals(Boolean.TRUE)){
+            return id;
+        }
         return file.getFileCode().substring(0, 6);
     }