diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileInfoController.java
index 0be085e..e1fb9b8 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileInfoController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileInfoController.java
@@ -177,28 +177,28 @@ public class RepoEdFileInfoController {
         return ElectromagneticResultUtil.success(edFileInfoService.addFavorite(userId, id));
     }
 
-    /**
-     * 从收藏夹移除
-     *
-     * @param id 文件id
-     * @return
-     */
-    @GetMapping("/removeCollection")
-    @UserOperation(value = "从收藏夹移除了文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
-    public ElectromagneticResult<?> removeFavorite(@RequestParam String id) {
-        String userId = UserThreadLocal.getUserId();
-        return ElectromagneticResultUtil.success(edFileInfoService.removeFavorite(userId, id));
-    }
-
-    /**
-     * 展示当前用户收藏夹文件
-     *
-     * @return
-     */
-    @PostMapping("/listCollection")
-    @UserOperation(value = "查看了收藏夹", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
-    public ElectromagneticResult<?> listFavorite(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
-        String userId = UserThreadLocal.getUserId();
-        return ElectromagneticResultUtil.success(edFileInfoService.findFavorite(userId, fileInfoQueryDTO));
-    }
+//    /**
+//     * 从收藏夹移除
+//     *
+//     * @param id 文件id
+//     * @return
+//     */
+//    @GetMapping("/removeCollection")
+//    @UserOperation(value = "从收藏夹移除了文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
+//    public ElectromagneticResult<?> removeFavorite(@RequestParam String id) {
+//        String userId = UserThreadLocal.getUserId();
+//        return ElectromagneticResultUtil.success(edFileInfoService.removeFavorite(userId, id));
+//    }
+//
+//    /**
+//     * 展示当前用户收藏夹文件
+//     *
+//     * @return
+//     */
+//    @PostMapping("/listCollection")
+//    @UserOperation(value = "查看了收藏夹", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
+//    public ElectromagneticResult<?> listFavorite(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
+//        String userId = UserThreadLocal.getUserId();
+//        return ElectromagneticResultUtil.success(edFileInfoService.findFavorite(userId, fileInfoQueryDTO));
+//    }
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/RolePermissionDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/RolePermissionDTO.java
index 9b41607..803bf89 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/RolePermissionDTO.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/RolePermissionDTO.java
@@ -37,4 +37,6 @@ public class RolePermissionDTO {
      * 子目录
      */
     private List<RolePermissionDTO> children;
+
+    private int dataOwnCode;
 }
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 dc6cce4..29b9d34 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
@@ -337,7 +337,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .set(EdFileInfo::getFileNote, updateFileInfoDTO.getFileNote()));
             String newName = updateFileInfoDTO.getFileName() + "." + fileInfo.getFileType() + "." + fileInfo.getFileCode();
             fileSystemService.renameFile(srcFilePath, newName);
-            UserThreadLocal.setSuccessInfo(commonService.getLastPrjLeafId(fileInfo.getFilePath()), updateFileInfoDTO.getId(), "更新文件信息成功，新文件名为 {}.{}", newFileName, fileInfo.getFileType());
+            UserThreadLocal.setSuccessInfo(commonService.getLastPrjLeafId(fileInfo.getFilePath()), updateFileInfoDTO.getId(), "更新文件信息成功，新文件名为 {}.{}，新备注为 {}", newFileName, fileInfo.getFileType(), updateFileInfoDTO.getFileNote());
             return ElectromagneticResultUtil.success(true);
         } catch (Exception e) {
             String info = StrFormatter.format("更新文件信息失败，新文件名 {}， 原因 {}", newFileName, e.getMessage());
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
index 3485419..5b0c894 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
@@ -178,7 +178,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
             if (count > 0) {
                 String info = StrFormatter.format("禁止废除非空项目，废除失败。");
                 log.info(info);
-                ElectromagneticResultUtil.fail("-1", info);
+                return ElectromagneticResultUtil.fail("-1", info);
             }
 
             LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
index c693761..2fa239b 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
@@ -272,14 +272,17 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     public RoleDTO getRoleTemplate() {
         RoleDTO roleDTO = new RoleDTO();
 
-        List<EdFileInfo> infos = getFiles(DataOwnEnum.SYS_PRJ.code);
-
+        List<EdFileInfo> sysInfos = getFiles(DataOwnEnum.SYS_PRJ.code);
+        List<EdFileInfo> repoInfos = getFiles(DataOwnEnum.REPO_PRJ.code);
+        List<EdFileInfo> infos = new ArrayList<>(sysInfos);
+        infos.addAll(repoInfos);
         List<RolePermissionDTO> nodes = new ArrayList<>();
         for (EdFileInfo info : infos) {
             RolePermissionDTO rolePermissionDTO = new RolePermissionDTO();
             rolePermissionDTO.setId(info.getId());
             rolePermissionDTO.setParentId(info.getParentId());
             rolePermissionDTO.setFileName(info.getFileName());
+            rolePermissionDTO.setDataOwnCode(info.getDataOwn());
             List<String> permissionCodes = new ArrayList<>();
             Map<String, Boolean> dataAuth = new HashMap<>();
             dataAuth.put("data", false);