From 18c43123b51a1688ab4ae01fe3d171c7d92e619b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期四, 16 一月 2025 18:19:34 +0800
Subject: [PATCH] 1、调整会话过期提示 2、流程设计器隐藏拓展按钮，隐藏右下角图标
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java | 5 +++--
1 files changed, 3 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..e89b4a6 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
@@ -122,7 +122,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 +144,5 @@
}
return dataGrid;
}
-
}
--
Gitblit v1.9.3