From 9f32e36cae17097e9387dc2922fb60a81dfd2b85 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 12 Sep 2025 10:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/web/controller/archive/ProjectController.java | 1 -
 .../java/com/bonus/web/domain/DaKyProFilesContentsDto.java  | 4 ++--
 .../java/com/bonus/web/service/impl/ProjectServiceImpl.java | 1 +
 bonus-admin/src/main/resources/mapper/ProjectMapper.xml     | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java
index c37a7ff..3ccfdd9 100644
--- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java
+++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java
@@ -49,7 +49,6 @@ public class ProjectController extends BaseController {
     @ApiOperation(value = "档案目录下拉")
     @GetMapping("getFileCatalogSelect")
     @SysLog(title = "档案目录下拉", module = "档案管理->档案目录下拉", businessType = OperaType.QUERY, details = "档案目录下拉", logType = 1)
-    @RequiresPermissions("file:catalog:select")
     public AjaxResult getFileCatalogSelect(ArchivalCatalogueDto dto) {
         try {
             List<SelectDto> list = service.getFileCatalogSelect(dto);
diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java
index 94a8d5d..48f301f 100644
--- a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java
+++ b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java
@@ -34,12 +34,12 @@ public class DaKyProFilesContentsDto {
     /**
      * 层级
      */
-    private String level;
+    private Integer level;
 
     /**
      * 分类号/案卷排序号
      */
-    private Long sort;
+    private Integer sort;
 
     /**
      * 档案标识代码
diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java
index e654548..e918336 100644
--- a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java
+++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java
@@ -1,5 +1,6 @@
 package com.bonus.web.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.bonus.common.core.domain.AjaxResult;
 import com.bonus.common.utils.bean.BeanUtils;
 import com.bonus.web.domain.ArchivalCatalogueDto;
diff --git a/bonus-admin/src/main/resources/mapper/ProjectMapper.xml b/bonus-admin/src/main/resources/mapper/ProjectMapper.xml
index 83031f2..37cde51 100644
--- a/bonus-admin/src/main/resources/mapper/ProjectMapper.xml
+++ b/bonus-admin/src/main/resources/mapper/ProjectMapper.xml
@@ -49,9 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="updateContentsName">
 		UPDATE da_ky_project
 		SET
-			content_name = #{contentsName}
+			contents_name = #{contentsName}
 		WHERE
-			id = #{id}
+			id = #{proId}
 	</update>
 
 	 <select id="list" resultType="com.bonus.web.domain.ProjectDto">
@@ -137,6 +137,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 					 INNER JOIN child_nodes c ON t.parent_id = c.id
 			WHERE t.del_flag = '1'
 		)
-		SELECT * FROM child_nodes
+		SELECT * FROM child_nodes ORDER BY id asc
 	</select>
 </mapper>