From d2048c247c446be08598abf8e1bc11a4ea77be32 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期三, 25 十月 2023 16:41:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
index 8813bbd..f58c6a8 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
@@ -4,6 +4,7 @@
import com.consum.base.pojo.BaseCategoryParam;
import com.consum.base.util.IdUtil;
import com.consum.model.po.BaseCategory;
+import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
@@ -26,8 +27,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
-// public int add(BaseCategoryParam param, S_user_core currentUser) {
- public int add(BaseCategoryParam param) {
+ public int add(BaseCategoryParam param, S_user_core currentUser) {
BaseCategory baseCategory = new BaseCategory();
BeanUtils.copyProperties(param, baseCategory);
baseCategory.setId(IdUtil.generateId());
@@ -43,9 +43,9 @@
baseCategory.setLevels(Constants.LEVELS_THREE);
}
}
- //TODO 鍒涘缓浜篿d鍜屽垱寤轰汉濮撳悕
-// baseCategory.setCreateUserId(currentUser.getId());
-// baseCategory.setCreateUserName(currentUser.getUser_name());
+ //鍒涘缓浜篿d鍜屽垱寤轰汉濮撳悕
+ baseCategory.setCreateUserId(currentUser.getId());
+ baseCategory.setCreateUserName(currentUser.getUser_name());
//鍒涘缓鏃堕棿
baseCategory.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
@@ -96,6 +96,8 @@
if (param.getStates() != null) {
sql.append(" and status =:status ");
paramts.put("status", param.getStates());
+ } else {
+ sql.append(" and states !=3 ");
}
sql.append(" ORDER BY ORDER_NUMBER,CREATE_TIME DESC ");
return selectSplit(sql.toString(), paramts, new BaseCategory());
@@ -120,22 +122,24 @@
}
/**
- * @Description 鏍规嵁鑺傜偣id鍒犻櫎鑺傜偣(閫昏緫鍒犻櫎)
+ * @Description 鏍规嵁id鍒犻櫎鐗╁搧鍒嗙被
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
- public int updateById(BaseCategory baseCategory) {
- baseCategory.setStates(Constants.CATEGORY_DELETED);
+ public int updateById(BaseCategory baseCategory, S_user_core currentUser) {
+ baseCategory.setStates(Constants.STATES_DELETED);
//鍒犻櫎鏃堕棿
baseCategory.setDTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- //TODO 鍒犻櫎浜篿d鍜屽垹闄や汉濮撳悕
+ //鍒犻櫎浜篿d鍜屽垹闄や汉濮撳悕
+ baseCategory.setDUserId(currentUser.getId());
+ baseCategory.setDUserName(currentUser.getUser_name());
return this.update(baseCategory);
}
/**
* 鏍规嵁鑺傜偣id鏌ヨ鑺傜偣璇︽儏
* @author 鍗㈠簡闃�
- * @date 2023/9/26
+ * @Date 2023/10/23
*/
public BaseCategory getById(Long id) {
return this.get(new BaseCategory(id));
--
Gitblit v1.9.1