From 19f40c8e0649ae81b3f0183a6f4c8aa6c3db39bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 18 Nov 2021 17:54:37 +0800
Subject: [PATCH] 证书打印信息导出修改,已过考试的，系统每天凌晨1点定时清理，标记为缺考，并生成缺考记录，保安员导入新增年龄判断，超过60岁的不能导入
---
src/main/java/org/springblade/modules/friend/mapper/FriendMapper.xml | 66 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/friend/mapper/FriendMapper.xml b/src/main/java/org/springblade/modules/friend/mapper/FriendMapper.xml
index a779bcb..8a3cf33 100644
--- a/src/main/java/org/springblade/modules/friend/mapper/FriendMapper.xml
+++ b/src/main/java/org/springblade/modules/friend/mapper/FriendMapper.xml
@@ -4,6 +4,70 @@
<select id="selectFriendPage" resultType="org.springblade.modules.friend.vo.FriendVO">
- select * from sys_friend
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ f.*,
+ u.real_name,
+ u.phone,
+ u.avatar,
+ u.id as friendid
+ FROM
+ sys_friend f
+ LEFT JOIN blade_user u ON f.friend = u.id
+ WHERE
+ 1 = 1
+ AND f.applicant = #{friend.applicant}
+ AND f.type = 1
+ AND u.is_deleted = 0 UNION ALL
+ SELECT
+ f.*,
+ u.real_name,
+ u.phone,
+ u.avatar,
+ u.id as friendid
+ FROM
+ sys_friend f
+ LEFT JOIN blade_user u ON f.applicant = u.id
+ WHERE
+ 1 = 1
+ AND f.friend = #{friend.applicant}
+ AND f.type = 1
+ AND u.is_deleted = 0
+ ) z
+ ORDER BY z.time DESC
+ </select>
+
+ <select id="friendApplication" resultType="org.springblade.modules.friend.vo.FriendVO">
+ SELECT
+ f.*,
+ u.real_name,
+ u.phone,
+ u.avatar,
+ u.id as friendid
+ FROM
+ sys_friend f
+ LEFT JOIN blade_user u ON f.applicant = u.id
+ WHERE
+ 1 = 1
+ AND f.friend = #{friend.applicant}
+ AND f.type = 0
+ AND u.is_deleted = 0
+ ORDER BY f.time DESC
+ </select>
+
+ <select id="addFriend" resultType="org.springblade.modules.friend.vo.FriendVO">
+ SELECT
+ u.real_name,
+ u.phone,
+ u.avatar,
+ u.id as friendid
+ FROM
+ blade_user u
+ WHERE
+ u.is_deleted = 0
+ AND (real_name like concat('%', #{friend.applicant},'%') or phone like concat('%', #{friend.applicant},'%'))
</select>
</mapper>
--
Gitblit v1.9.3