From 98f2e843d13efe8e48a1bc210d82f3f85528f561 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 21 十月 2025 11:50:43 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 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 9d6cd82..e357e36 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
@@ -16,9 +16,12 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindException;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -38,7 +41,8 @@
     private CategoryMapper categoryMapper;
 
     @Override
-    public Integer create(Category category) {
+    @Transactional(rollbackFor = {Exception.class, BindException.class})
+    public Integer create(Category category){
         checkUnique(category);
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         if(loginUserInfo ==null){
@@ -54,10 +58,19 @@
         insert.setRemark(category.getRemark());
         insert.setStatus(Constants.ZERO);
         insert.setSortnum(category.getSortnum());
+        insert.setBizType(category.getBizType());
         insert.setImgurl(category.getImgurl());
         insert.setType(category.getType());
         insert.setParentId(category.getParentId());
         categoryMapper.insert(insert);
+        if(insert.getBizType()!=null){
+            //娓呯┖鍏朵粬bizType,鍙繚鐣欏綋鍓嶆柊澧炶褰曞敮涓�鏈夋晥
+            categoryMapper.update(null,new UpdateWrapper<Category>().lambda()
+                    .set(Category::getBizType,null)
+                    .eq(Category::getBizType,insert.getType())
+                    .ne(Category::getId,insert.getId())
+            );
+        }
         return insert.getId();
     }
 
@@ -85,9 +98,18 @@
     }
 
     @Override
+    @Transactional(rollbackFor = {Exception.class, BindException.class})
     public void updateById(Category category) {
         checkUnique(category);
         categoryMapper.updateById(category);
+        if(category.getBizType()!=null){
+            //娓呯┖鍏朵粬璇izType灞炴��,鍙繚鐣欏綋鍓嶈褰曞敮涓�鏈夋晥
+            categoryMapper.update(null,new UpdateWrapper<Category>().lambda()
+                    .set(Category::getBizType,null)
+                    .eq(Category::getBizType,category.getBizType())
+                    .ne(Category::getId,category.getId())
+            );
+        }
     }
 
     @Override
@@ -135,13 +157,15 @@
         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);
+                .like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Category::getName,pageWrap.getModel().getName())
+                .isNull(Category::getParentId)
+                .orderByDesc(Category::getSortnum);
         PageData<Category> categoryPageData = PageData.from(categoryMapper.selectPage(page, queryWrapper));
         //鏌ヨ鎵�鏈変簩绾ф暟鎹�
         List<Category> categoryList = categoryMapper.selectList(
                 new QueryWrapper<Category>().lambda()
                         .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
-                        .eq(Category::getIsdeleted,Constants.ZERO).isNotNull(Category::getParentId));
+                        .eq(Category::getIsdeleted,Constants.ZERO).isNotNull(Category::getParentId).orderByDesc(Category::getSortnum));
 
         for (Category category:categoryPageData.getRecords()) {
             category.setChildCategoryList(
@@ -159,6 +183,10 @@
     }
     @Override
     public  List<Category> findChileList(Category model) {
+        if(Objects.isNull(model)){
+            model = new Category();
+        }
+        model.setIsdeleted(Constants.ZERO);
         List<Category> list =findList(model);
         List<Category> data = new ArrayList<>();
         if(list!=null){
@@ -171,6 +199,8 @@
                         category.setGroupName( category.getParentName()+"/"+category.getName());
                         data.add(category);
                     }
+                }else{
+                    data.add(category);
                 }
             }
         }
@@ -193,10 +223,11 @@
         wrapper.lambda()
                 .eq(Category::getIsdeleted,Constants.ZERO)
                 .eq(Category::getType,category.getType())
-                .eq(Category::getName,category.getName());
+                .eq(Category::getName,category.getName())
+                .ne(category.getId()!=null, Category::getId,category.getId())
+        ;
 
         List<Category> categories = categoryMapper.selectList(wrapper);
-
         if (org.apache.commons.collections.CollectionUtils.isNotEmpty(categories)){
             throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍒嗙被淇℃伅宸插瓨鍦�");
         }

--
Gitblit v1.9.3