From 7327c2b113573bccaeef5b3fc5c82011abc00cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 15:58:03 +0800
Subject: [PATCH] 设备，车辆接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 9461e96..e40c8c8 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -398,11 +398,14 @@
*
FROM
blade_user where 1=1
- <if test="type!=null and type=='1'.toString()">
+ <if test="type!=null and type=='2'.toString()">
and role_id='1414840172333842433' and `status`=1 AND is_deleted=0
</if>
- <if test="type!=null and type=='2'.toString()">
- and role_id='1412226235153731586' and `status`=1 AND is_deleted=0
+ <if test="type!=null and type=='1'.toString()">
+ AND ( role_id = '1412226235153731586'
+ OR role_id = '1416733602219110402') AND `status` = 1
+ AND is_deleted = 0
+ AND dept_id = '1425665656887545857'
</if>
<if test="deptid!=null and deptid!=''">
and dept_id=#{deptid}
--
Gitblit v1.9.3