From ffb62aac389a6ac596fe8d0d44d4e242beeea0f2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 10 Mar 2022 11:46:31 +0800
Subject: [PATCH] 考勤查询接口修改,电子围栏自定义新增、修改,查询一个点是否在电子围栏内接口新增

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |    5 ++++-
 1 files changed, 4 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 85a849c..81e0138 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -360,7 +360,7 @@
             and account like concat('%', #{user.account},'%')
         </if>
         <if test="user.roleId!=null and user.roleId != ''">
-            and br.role_alias = '公安管理员'
+            and (br.role_alias = '公安管理员' or br.role_alias = '民警')
         </if>
         <if test="user.realName!=null and user.realName != ''">
             and real_name like concat(concat('%', #{user.realName}),'%')
@@ -1126,6 +1126,9 @@
         )
     </select>
 
+    <select id="getUserById" resultType="org.springblade.modules.system.entity.User">
+        select * from blade_user where id = #{id}
+    </select>
 
 
 </mapper>

--
Gitblit v1.9.3