From be30e17e3c7685a54f761bf3a03487308c939270 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期三, 05 三月 2025 18:05:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java
index b5667fb..2c5ed6a 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java
@@ -9,6 +9,7 @@
import com.vci.ubcs.system.vo.MdmCountConfigVO;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
@@ -31,21 +32,24 @@
* @return
*/
@Override
- public boolean saveMdmCountConfig(MdmCountConfigVO mdmCountConfigVO) throws ServiceException{
+ public R saveMdmCountConfig(MdmCountConfigVO mdmCountConfigVO) throws ServiceException{
if(Func.isEmpty(mdmCountConfigVO) || Func.isBlank(mdmCountConfigVO.getUserId().toString())){
throw new ServiceException("涓绘暟鎹粺璁￠厤缃繚瀛樻椂缂哄皯蹇呭～鍙傛暟!");
}
- boolean res = false;
- if (mdmCountConfigVO.getMdmNameList().isEmpty()) {
- return true;
+ if(mdmCountConfigVO.getMdmNameList().isEmpty()) {
+ return R.status(false);
}
+ if(mdmCountConfigVO.getMdmNameList().size() > 8){
+ return R.fail("鏄剧ず鐨勪富鏁版嵁閰嶇疆椤规渶澶氫负8椤�");
+ }
+ boolean res = false;
try {
String mdmNames = mdmCountConfigVO.getMdmNameList().stream().collect(Collectors.joining(","));
MdmCountConfig mdmCountConfigDB = getMdmCountConfig(mdmCountConfigVO.getUserId().toString());
MdmCountConfig mdmCountConfig = new MdmCountConfig();
//鏂板
- if(Func.isBlank(mdmCountConfigVO.getId().toString())){
- Func.copy(mdmCountConfigVO,mdmCountConfig);
+ if(Func.isEmpty(mdmCountConfigDB)){
+ mdmCountConfig.setUserId(mdmCountConfigVO.getUserId());
}else {
//淇敼
Func.copy(mdmCountConfigDB,mdmCountConfig);
@@ -55,7 +59,7 @@
}catch (Exception e){
throw new ServiceException("閰嶇疆淇濆瓨澶辫触,鍘熷洜锛�"+e.getCause());
}
- return res;
+ return R.status(res);
}
/**
--
Gitblit v1.9.3