From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
index dfba448..9819c50 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
@@ -14,6 +14,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,11 +39,16 @@
public String create(BaseParam baseParam) {
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ if (Objects.isNull(baseParam.getType()) || StringUtils.isEmpty(baseParam.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍙傛暟閿欒");
+ }
+
QueryWrapper<BaseParam> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(BaseParam::getType,baseParam.getType())
.eq(BaseParam::getIsdeleted,Constants.ZERO)
- .eq(BaseParam::getType,baseParam.getName());
+ .eq(BaseParam::getName,baseParam.getName());
Integer count = baseParamMapper.selectCount(wrapper);
if (count > 0){
@@ -91,7 +97,7 @@
wrapper.lambda()
.eq(BaseParam::getType,baseParam.getType())
.eq(BaseParam::getIsdeleted,Constants.ZERO)
- .eq(BaseParam::getType,baseParam.getName());
+ .eq(BaseParam::getName,baseParam.getName());
BaseParam baseParam1 = baseParamMapper.selectOne(wrapper.last(" limit 1"));
if (Objects.nonNull(baseParam1) && !baseParam1.getId().equals(baseParam.getId())){
--
Gitblit v1.9.3