From 33b240044cca6ae3711da72e9846b048ea1c4c84 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Tue, 16 Sep 2025 09:24:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=86=E7=B1=BB=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/archive/ArchiveController.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java
index b7a1e0c..9a4339a 100644
--- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java
+++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java
@@ -93,7 +93,10 @@ public class ArchiveController extends BaseController {
             if (vo.getLevel() == null) {
                 return R.fail("级别有误");
             }
-            int num = service.geMaxSort(vo.getParentId().toString());
+            Integer num = service.geMaxSort(vo.getParentId().toString());
+            if (num == null) {
+                num = 0;
+            }
             if (vo.getSort() <= num) {
                 return R.fail("排序序号需大于" + num);
             }
@@ -137,7 +140,10 @@ public class ArchiveController extends BaseController {
     @RequiresPermissions("archive:catalogue:edit")
     public R editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) {
         try {
-            int num = service.geMaxSort(vo.getParentId().toString());
+            Integer num = service.geMaxSort(vo.getParentId().toString());
+            if (num == null) {
+                num = 0;
+            }
             int sort = service.getSortById(vo.getId());
             if (sort != vo.getSort() && vo.getSort() <= num) {
                 return R.fail("排序序号需大于" + num);
@@ -185,7 +191,10 @@ public class ArchiveController extends BaseController {
     @SysLog(title = "查询最大sort", module = "档案管理->查询最大sort", businessType = OperaType.QUERY, details = "查询最大sort", logType = 1)
     public AjaxResult geMaxSort(String parentId) {
         try {
-            int num = service.geMaxSort(parentId);
+            Integer num = service.geMaxSort(parentId);
+            if (num == null) {
+                num = 0;
+             }
             return AjaxResult.success(num);
         } catch (Exception e) {
             log.error(e.toString(), e);