From 67c98cdd79a1e473fe95ddc1c695ed162c176510 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 15:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 30556c4..5af30f1 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
@@ -21,6 +21,7 @@
import com.github.yulichang.base.MPJBaseMapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
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;
@@ -56,10 +57,12 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- LoginUserInfo loginUserInfo = category.getLoginUserInfo();
- category.setCreateTime(new Date());
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
category.setDeleted(Constants.ZERO);
+ category.setCreateTime(new Date());
category.setCreateUser(loginUserInfo.getId());
+ category.setUpdateTime(new Date());
+ category.setUpdateUser(loginUserInfo.getId());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())){
category.setDetail(category.getDetailList().toJSONString());
}
@@ -103,7 +106,22 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- LoginUserInfo loginUserInfo = category.getLoginUserInfo();
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ category.setUpdateTime(new Date());
+ category.setIsFixed(null);
+ category.setUpdateUser(loginUserInfo.getId());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())){
+ category.setDetail(category.getDetailList().toJSONString());
+ }
+ categoryMapper.updateById(category);
+ }
+ @Override
+ public void updateStatus(Category category) {
+ if(Objects.isNull(category)
+ || Objects.isNull(category.getId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
category.setUpdateTime(new Date());
category.setIsFixed(null);
category.setUpdateUser(loginUserInfo.getId());
--
Gitblit v1.9.3