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.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index cde4625..3b5d29a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -298,4 +298,23 @@
 	 */
 	void updateLogout(@Param("list") List<String> userIds);
 
+	/**
+	 * 判断是否报名
+	 * @param id
+	 * @return
+	 */
+	User getUserIsApply(@Param("id") Long id);
+
+	/**
+	 * 自定义查询详情信息
+	 * @param id
+	 * @return
+	 */
+    UserVO getUserDetailById(@Param("id") Long id);
+
+	/**
+	 * 查询未关联的保安员
+	 * @return
+	 */
+	List<User> getNotGlList();
 }

--
Gitblit v1.9.3