From 6f7f3834f66b08bed7af331ce1a168d6cd89292d Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期五, 03 一月 2025 18:14:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
index 0a8e9b1..00e1816 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
@@ -7,6 +7,7 @@
import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.OperateVO;
import com.vci.starter.poi.bo.SheetDataSet;
import com.vci.starter.poi.bo.SheetRowData;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -25,6 +26,7 @@
import com.vci.web.util.PlatformClientUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -116,6 +118,9 @@
VciBaseUtil.alertNotNull(menuVO,"淇敼鐨勬ā鍧楀璞�");
try {
String res = "";
+ if(!menuVO.getAlias().matches("[a-z A-Z \\p{Punct}+]*")){
+ throw new VciBaseException("娉ㄦ剰锛氬睘鎬у悕鍙兘涓鸿嫳鏂囧瓧姣�!");
+ }
//鏇存柊鏁版嵁搴�
res = foDelegate.updateMod(menuVO);
/**
@@ -224,12 +229,30 @@
}
/**
+ * 鎿嶄綔瀵硅薄澶嶅埗
+ * @param operateVO 鎿嶄綔浼犺緭瀵硅薄
+ * @param operateInfo 鎿嶄綔淇℃伅
+ */
+ private void copyOperationProperties(OperateVO operateVO, OperateInfo operateInfo){
+ operateInfo.id = operateVO.getId();
+ operateInfo.name = operateVO.getName();
+ operateInfo.alias = operateVO.getAlias();
+ operateInfo.image = operateVO.getSource();
+ operateInfo.desc = operateVO.getDesc();
+ operateInfo.identify = operateVO.getIdentify();
+ operateInfo.seq = operateVO.getSeq();
+ }
+
+ /**
* 澧炲姞鎿嶄綔绫诲瀷
* @return
*/
@Override
- public OperateInfo addOperationType(OperateInfo operateInfo) throws VciBaseException {
+ public OperateInfo addOperationType(OperateVO operateVO) throws VciBaseException {
try {
+ OperateInfo operateInfo = new OperateInfo();
+ copyOperationProperties(operateVO,operateInfo);
+ operateInfo.image = operateVO.getSource();
//鏍￠獙
this.checkItem(operateInfo);
String s = foDelegate.saveOperate(operateInfo);
@@ -253,13 +276,16 @@
/**
* 淇敼鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
@Override
- public OperateInfo updateOperationType(OperateInfo operateInfo) throws VciBaseException {
+ public OperateInfo updateOperationType(OperateVO operateVO) throws VciBaseException {
try {
+ OperateInfo operateInfo = new OperateInfo();
+ copyOperationProperties(operateVO, operateInfo);
this.checkItem(operateInfo);
+ operateInfo.image = operateVO.getSource();
String res = foDelegate.updateOperate(operateInfo);
/**杩斿洖1琛ㄧず鍚嶇О鏈夐噸澶嶏紝杩斿洖2琛ㄧず鏍囪瘑鏈夐噸澶�,杩斿洖3琛ㄧず椤哄簭鏈夐噸澶�**/
if (res.equals("1")) {
@@ -329,7 +355,7 @@
if (operateInfo.name.length() > 128) {
throw new VciBaseException("鍚嶇О闀垮害涓嶈兘瓒呰繃128锛�");
}
- if (operateInfo.desc.length() > 255) {
+ if (operateInfo.desc != null &&operateInfo.desc.length() > 255) {
throw new VciBaseException("鎻忚堪闀垮害涓嶈兘瓒呰繃255锛�");
}
if (operateInfo.alias.length() > 128) {
--
Gitblit v1.9.3