From d6ee0e1e4a5d0c61565b2af954a1845f2022d85f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 26 Aug 2021 09:08:37 +0800
Subject: [PATCH] 二维码接口修改（中文不识别），保安员查询新增帅选条件
---
src/main/java/org/springblade/modules/friend/controller/FriendController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/friend/controller/FriendController.java b/src/main/java/org/springblade/modules/friend/controller/FriendController.java
index 42bf5ef..b595cb4 100644
--- a/src/main/java/org/springblade/modules/friend/controller/FriendController.java
+++ b/src/main/java/org/springblade/modules/friend/controller/FriendController.java
@@ -62,7 +62,7 @@
}
/**
- * 多表联合查询自定义分页
+ * 多表联合查询自定义分页（查看好友列表）
*/
@GetMapping("/page")
@ApiImplicitParams({
@@ -77,6 +77,25 @@
}
/**
+ * 查看好友申请
+ */
+ @GetMapping("/friendApplication")
+ public R<IPage<FriendVO>> friendApplication(@ApiIgnore FriendVO friend, Query query) {
+ IPage<FriendVO> pages = friendService.friendApplication(Condition.getPage(query), friend);
+ return R.data(pages);
+ }
+
+ /**
+ * 搜索好友
+ */
+ @GetMapping("/addFriend")
+ public R<IPage<FriendVO>> addFriend(@ApiIgnore FriendVO friend, Query query) {
+ IPage<FriendVO> pages = friendService.addFriend(Condition.getPage(query), friend);
+ return R.data(pages);
+ }
+
+
+ /**
* 新增
*/
@PostMapping("/save")
--
Gitblit v1.9.3