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/web/service/OsBaseServiceI.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java
index 4fbf26c..445cb70 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java
@@ -1,5 +1,6 @@
package com.vci.web.service;
+import com.vci.corba.common.PLException;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -122,7 +123,9 @@
pageHelper = new PageHelper(-1);
}
//鏈夐渶瑕佽浆鎹㈢殑灞炴��
- pageHelper.addDefaultAsc("name");
+ if(StringUtils.isBlank(pageHelper.getSort()) && StringUtils.isBlank(pageHelper.getOrder())) {//濡傛灉娌℃湁璁剧疆鎺掑簭瀛楁锛屽垯榛樿涓�涓�
+ pageHelper.addDefaultAsc("name");
+ }
VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(baseQueryObject.getConditionMap(), tClass,pageHelper);
queryWrapperForDO.setConditionMap(queryWrapperForDO.switchConditionMap());
queryWrapperForDO.wrapperSql();
@@ -142,6 +145,5 @@
}
return dataGrid;
}
-
}
--
Gitblit v1.9.3