From 90b486ba54098be293a256d9313d201a3bd5221f Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 18 十月 2023 21:31:02 +0800 Subject: [PATCH] 1、编码规则增加显示所有者列,高级查询中增加所有者; 2、用户管理界面添加停用启用按钮。 --- 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..3ebe012 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() > 7){ + 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