From d7dca690cedd12e271f0ee0b9050679d73796f5c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 06 一月 2025 09:28:10 +0800
Subject: [PATCH] 1

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 6de45a4..e75dac5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -135,7 +135,9 @@
         Utils.MP.blankToNull(pageWrap.getModel());
         queryWrapper.lambda().eq(Category::getIsdeleted,Constants.ZERO)
                 .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
-                .isNull(Category::getParentId);
+                .isNull(Category::getParentId)
+                .orderByAsc(Category::getSortnum)
+        ;
         PageData<Category> categoryPageData = PageData.from(categoryMapper.selectPage(page, queryWrapper));
         //鏌ヨ鎵�鏈変簩绾ф暟鎹�
         List<Category> categoryList = categoryMapper.selectList(
@@ -191,6 +193,7 @@
     private void checkUnique(Category category){
         QueryWrapper<Category> wrapper = new QueryWrapper<>();
         wrapper.lambda()
+                .ne(Objects.nonNull(category.getId()),Category::getId,category.getId())
                 .eq(Category::getIsdeleted,Constants.ZERO)
                 .eq(Category::getType,category.getType())
                 .eq(Category::getName,category.getName());

--
Gitblit v1.9.3