From 9c67a9d48ec6a71e2d4edf11fae3f5e802a97bff Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 19 十一月 2024 16:35:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java
index aea8786..4b62737 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java
@@ -116,8 +116,8 @@
res = foDelegate.updateMod(menuVO);
/**
* 杩斿洖锛�1琛ㄧず妯″潡鍚嶉噸澶嶃��
- * 2琛ㄧず妯″潡鏍囪瘑閲嶅銆�
- * 3鏍囩ず妯″潡鍒悕閲嶅銆�
+ * 2琛ㄧず妯″潡鏍囪瘑閲嶅銆�
+ * 3鏍囩ず妯″潡鍒悕閲嶅銆�
*/
if(res.equals("1")){
throw new VciBaseException("妯″潡鍚嶇О閲嶅锛岃淇敼锛�");
@@ -1245,7 +1245,8 @@
//info.suffixB = object.getSuffixB() == null ? "" : object.getSuffixB();
info.desc = object.getRemark() == null ? "" : object.getRemark();
info.seq = object.getSort();
- info.icon = object.getSource() == null ? "" : object.getSource();
+ info.image = object.getSource() == null ? "" : object.getSource();
+ info.functionType = object.getFunctionType();
info.isValid = object.getIsValid();
info.aliasName = object.getAlias() == null ? "" : object.getAlias();
info.resourceDotNet = object.getResourceDotNet() == null ? "" : object.getResourceDotNet();
@@ -1312,7 +1313,8 @@
/*obj.suffixC = "";
obj.suffixB = "";*/
obj.seq = sequence;
- obj.icon = menuVO.getSource();
+ obj.image = menuVO.getSource();
+ obj.functionType = menuVO.getFunctionType();
obj.isValid = Func.isNotEmpty(menuVO.getIsValid()) ? menuVO.getIsValid():false;
obj.aliasName = aliasName;
obj.resourceDotNet = resDotNet;
--
Gitblit v1.9.3