From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
index 603c490..dfb65c9 100644
--- a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
+++ b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
@@ -27,15 +27,32 @@
u.real_name as realname
FROM
sys_socil s
- LEFT JOIN blade_user u ON s.namb = u.id where 1=1
+ LEFT JOIN
+ blade_user u
+ ON
+ s.cardid = u.cardid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = s.jurisdiction
+ where 1=1
+ and u.is_deleted = 0
+ AND u.status = 1
+ AND u.role_id = '1412226235153731586'
+ <if test="social.jurisdiction!=null and social.jurisdiction!='' and social.jurisdiction!='1372091709474910209'">
+ and (sj.id=#{social.jurisdiction} or sj.parent_id = #{social.jurisdiction})
+ </if>
<if test="social.realname!=null and social.realname!=''">
and u.real_name like concat(concat('%', #{social.realname}),'%')
</if>
+ <if test="social.cardid!=null and social.cardid!=''">
+ and s.cardid like concat(concat('%', #{social.cardid}),'%')
+ </if>
+ <if test="social.namb!=null and social.namb!=''">
+ and s.namb like concat('%',#{social.namb},'%')
+ </if>
<if test="social.deptid!=null and social.deptid!=''">
and s.deptid=#{social.deptid}
- </if>
- <if test="social.jurisdiction!=null and social.jurisdiction!=''">
- and s.jurisdiction=#{social.jurisdiction}
</if>
</select>
--
Gitblit v1.9.3