From 2fdf30b77e0614f4785c7893a01958e8c8db8545 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 04 Dec 2021 16:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 4 +---
1 files changed, 1 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 361bfa5..82124da 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -80,9 +80,6 @@
br.id = bu.role_id
where
bu.is_deleted = 0
- and bd.parent_id!=1425365577303621633
- and bd.id != 1425365577303621633
- and bd.id != 1432625856013971457
<if test="user.account!=null and user.account != ''">
and bu.account like concat('%', #{user.account},'%')
</if>
@@ -450,6 +447,7 @@
sys_dispatcher_unit sdu
on
sdu.id = sd.dispatcher_unit_id
+ left join
where
bu.dispatch =0
and bu.status = 1
--
Gitblit v1.9.3