From 8da27238ae8ed8a6963d13d9a4aede301ac22d32 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 12 一月 2022 13:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
sandu-common/src/main/java/com/sandu/common/util/ResponseUtil.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/sandu-common/src/main/java/com/sandu/common/util/ResponseUtil.java b/sandu-common/src/main/java/com/sandu/common/util/ResponseUtil.java
index 7ffed07..f9a8ddf 100644
--- a/sandu-common/src/main/java/com/sandu/common/util/ResponseUtil.java
+++ b/sandu-common/src/main/java/com/sandu/common/util/ResponseUtil.java
@@ -1,5 +1,6 @@
package com.sandu.common.util;
+import com.github.pagehelper.Page;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.ResponseStatusEnums;
@@ -26,6 +27,9 @@
* 杩斿洖 鎴愬姛
*/
public static ResponseVO<Object> success(Object data) {
+ if(data instanceof Page){
+ return new ResponseVO<>(ResponseStatusEnums.SUCCESS.getCode(), ResponseStatusEnums.SUCCESS.getMessage(), CommonPage.restPage((Page<?>)data));
+ }
return new ResponseVO<>(ResponseStatusEnums.SUCCESS.getCode(), ResponseStatusEnums.SUCCESS.getMessage(), data);
}
--
Gitblit v1.9.3