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/system/mapper/RoleMapper.xml |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
index 2da5a36..f5a92c3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
@@ -21,16 +21,22 @@
     </resultMap>
 
     <select id="selectRolePage" resultMap="roleResultMap">
-        select * from blade_role where is_deleted = 0
+        select *
+        from blade_role
+        where is_deleted = 0
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">
-        select id, parent_id, role_name as title, id as "value", id as "key" from blade_role where is_deleted = 0
+        select id, parent_id, role_name as title, id as "value", id as "key" from blade_role where is_deleted = 0 AND
+        id!=1123598816738675201
         <if test="param1!=null">
             and tenant_id = #{param1}
         </if>
         <if test="param2!=null">
-            and role_alias &lt;&gt; #{param2}
+            and dept_id = #{param2}
+        </if>
+        <if test="param3!=null">
+            and role_alias &lt;&gt; #{param3}
         </if>
     </select>
 
@@ -60,4 +66,27 @@
         and is_deleted = 0
     </select>
 
+
+    <select id="Info" resultType="java.lang.String">
+        SELECT role_alias as rolename
+        FROM blade_role
+        WHERE id = #{id}
+          and is_deleted = 0
+    </select>
+
+    <select id="selectRole" resultType="java.util.HashMap">
+        SELECT id,
+               role_name AS title
+        FROM blade_role
+        WHERE is_deleted = 0
+          AND id != 1123598816738675201
+	AND id != 1414575877054365698
+	AND id != 1414840172333842433
+	AND id != 1415870935329771522
+	AND id != 1416733602219110402
+	AND id != 1428177141018771458
+	AND id != 1428972101748465665
+	AND id != 1431234799414071297
+    </select>
+
 </mapper>

--
Gitblit v1.9.3