From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/AchieveRuleAction.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/AchieveRuleAction.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/AchieveRuleAction.java
index 0bd78af..ee9deaf 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/AchieveRuleAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/AchieveRuleAction.java
@@ -15,7 +15,6 @@
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.AchieveRule;
import com.matrix.system.hive.dao.AchieveRuleDao;
-import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hiveErp.pojo.AchieveRuleItem;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -46,11 +45,8 @@
@PostMapping("/add")
public AjaxResult add(@RequestBody @Validated AchieveRule achieveRule) {
- WebUtil.setSessionAttribute(MatrixConstance.LOGIN_KEY,sysUsersDao.selectById(2L));
- if(CollectionUtils.isEmpty(achieveRule.getRuleItemList())){
- return AjaxResult.buildFailInstance("规则设置不能为空");
- }
+
String rules = JSONUtil.toJsonStr(achieveRule.getRuleItemList());
achieveRule.setRules(rules);
@@ -72,14 +68,11 @@
*/
@PostMapping("/update")
public AjaxResult update(@RequestBody @Validated AchieveRule achieveRule) {
- WebUtil.setSessionAttribute(MatrixConstance.LOGIN_KEY,sysUsersDao.selectById(2L));
+
if (achieveRule.getId() == null) {
return AjaxResult.buildFailInstance("id不能为空");
}
- if(CollectionUtils.isEmpty(achieveRule.getRuleItemList())){
- return AjaxResult.buildFailInstance("规则设置不能为空");
- }
String rules = JSONUtil.toJsonStr(achieveRule.getRuleItemList());
achieveRule.setRules(rules);
@@ -99,7 +92,7 @@
@GetMapping("/removeById/{id}")
public AjaxResult removeById(@PathVariable Long id) {
achieveRuleDao.deleteById(id);
- return AjaxResult.buildFailInstance("删除成功");
+ return AjaxResult.buildSuccessInstance("删除成功");
}
@@ -111,7 +104,7 @@
*/
@PostMapping("/selectList")
public AjaxResult selectList(@RequestBody BasePageQueryDto pageDto) {
- WebUtil.setSessionAttribute(MatrixConstance.LOGIN_KEY,sysUsersDao.selectById(2L));
+
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
Page<AchieveRule> page = new Page<>(pageDto.getPageNum(), pageDto.getPageSize());
LambdaQueryWrapper<AchieveRule> lambdaQueryWrapper = new LambdaQueryWrapper<AchieveRule>()
--
Gitblit v1.9.1