From 139b8a6b0ca15f07f4ed80fbbe21c1474f353db2 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 十二月 2024 19:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 bdbf056..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,7 +193,7 @@
private void checkUnique(Category category){
QueryWrapper<Category> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(Objects.nonNull(category.getId()),Category::getId,category.getId())
+ .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