From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 10ff25f..c3aeaa3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -1137,7 +1137,7 @@
<!--根据手机号获取用户信息-->
<select id="getUserByPhone" resultType="org.springblade.modules.system.entity.User">
select * from blade_user where is_deleted = 0 and status = 1
- and tenant_id = #{tenantId} and phone = #{phone}
+ and tenant_id = #{tenantId} and phone = #{phone} limit 1
</select>
<!--按天查询 day 天未登录的人员ids集合信息-->
@@ -1183,5 +1183,29 @@
</choose>
</update>
+ <!--判断是否报名-->
+ <select id="getUserIsApply" resultType="org.springblade.modules.system.entity.User">
+ select bu.* from blade_user bu
+ left join blade_role br on br.id = bu.role_id
+ where bu.is_deleted = 0 and bu.status = 1 and bu.id = #{id}
+ and br.role_alias = '保安'
+ </select>
+
+ <!--自定义查询详情信息-->
+ <select id="getUserDetailById" resultType="org.springblade.modules.system.vo.UserVO">
+ select bu.* from blade_user bu
+ where bu.is_deleted = 0
+ and bu.id = #{id}
+ </select>
+
+ <!--查询未关联的保安员-->
+ <select id="getNotGlList" resultType="org.springblade.modules.system.entity.User">
+ select bu.* from blade_user bu
+ left join blade_user_detail bud on bu.id = bud.user_id and bud.is_deleted = 0
+ where bu.is_deleted = 0
+ and bu.role_id = '1412226235153731586'
+ and bud.id is null
+ </select>
+
</mapper>
--
Gitblit v1.9.3