From e0754a4e7ae458c6b8fe03fa073f063a657da240 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 16:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 0481db9..642bff7 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -25,6 +25,7 @@
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 java.util.Date;
@@ -46,6 +47,7 @@
private SystemDictDataBiz systemDictDataBiz;
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(Category category) {
if(Objects.isNull(category)
|| Objects.isNull(category.getType())
@@ -61,7 +63,8 @@
category.setCreateUser(loginUserInfo.getId());
category.setUpdateTime(new Date());
category.setUpdateUser(loginUserInfo.getId());
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())
+ && !Constants.equalsInteger(category.getType(),Constants.THREE)){
category.setDetail(category.getDetailList().toJSONString());
}
if(!Constants.equalsInteger(category.getType(),Constants.ONE)){
@@ -93,6 +96,7 @@
}
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void updateById(Category category) {
if(Objects.isNull(category)
|| Objects.isNull(category.getId())
@@ -107,7 +111,8 @@
category.setUpdateTime(new Date());
category.setIsFixed(null);
category.setUpdateUser(loginUserInfo.getId());
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())
+ && !Constants.equalsInteger(category.getType(),Constants.THREE)){
category.setDetail(category.getDetailList().toJSONString());
}
categoryMapper.updateById(category);
--
Gitblit v1.9.3