From 9e20b9fb77a41cb5b4a6eb6213fc51cab1f0bb91 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 23 八月 2024 18:00:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 841f993..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
@@ -123,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();
--
Gitblit v1.9.3