From e96322043649fdc8fc02d886ac19cf8342a43248 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期一, 04 十一月 2024 11:37:13 +0800
Subject: [PATCH] 在登录时判断用户密码过期需要修改时，由于还未登录去获取当前Session的用户时，是null，所以导致报错，增加如果为空，直接使用界面传的用户。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 897ed4a..af0b749 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
@@ -1245,7 +1245,7 @@
//info.suffixB = object.getSuffixB() == null ? "" : object.getSuffixB();
info.desc = object.getRemark() == null ? "" : object.getRemark();
info.seq = object.getSort();
- info.image = object.getSource() == null ? "" : object.getSource();
+ info.icon = object.getSource() == null ? "" : object.getSource();
info.isValid = object.getIsValid();
info.aliasName = object.getAlias() == null ? "" : object.getAlias();
info.resourceDotNet = object.getResourceDotNet() == null ? "" : object.getResourceDotNet();
@@ -1312,7 +1312,7 @@
/*obj.suffixC = "";
obj.suffixB = "";*/
obj.seq = sequence;
- obj.image = menuVO.getSource();
+ obj.icon = menuVO.getSource();
obj.isValid = Func.isNotEmpty(menuVO.getValid()) ? menuVO.getValid():false;
obj.aliasName = aliasName;
obj.resourceDotNet = resDotNet;
--
Gitblit v1.9.3