From 87e51a66bbad8eb287755c9ffa91e78345919f8b Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 05 七月 2023 18:15:40 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java
index 780a0c2..b833bf9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java
@@ -8,6 +8,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import org.springblade.core.mp.support.Query;
import java.io.Serializable;
import java.util.HashMap;
@@ -103,10 +104,15 @@
this.limit = limit;
}
+ /**
+ * 浠庝互鍓嶇殑椤圭洰鎷疯礉杩囨潵鐨勫垎椤�
+ * @return
+ */
@JSONField(
serialize = false,
deserialize = false
)
+ @Deprecated
public PageHelper getPageHelper() {
PageHelper pageHelper = new PageHelper(this.limit);
pageHelper.setPage(this.getPage());
@@ -115,6 +121,7 @@
return pageHelper;
}
+
public BaseQueryObject addSort(String sort, String order) {
this.setSort(StringUtils.isBlank(this.getSort()) ? sort : this.getSort() + "," + sort);
this.setOrder(StringUtils.isBlank(this.getOrder()) ? order : this.getOrder() + "," + order);
--
Gitblit v1.9.3