From 6036a3f2b7fba39cb6ec2a6e2a61b5ee06d5076f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 30 Nov 2021 10:29:23 +0800
Subject: [PATCH] ftp mysql 连接修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 7a68e7b..33d9bc7 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1750,16 +1750,17 @@
u.photo,
u.examination_type,
u.dispatch,
- i.enterpriseName
+ bd.dept_name enterpriseName
FROM
blade_user u
- LEFT JOIN sys_information i ON i.departmentid = u.dept_id
+ LEFT JOIN blade_dept bd ON bd.id = u.dept_id
WHERE
u.role_id = '1412226235153731586'
AND u.is_deleted = 0
- AND u.`status` =1
+ AND u.`status` = 1
+ and bd.is_deleted = 0
<if test="deptid!=null and deptid!=''">
- and dept_id=#{deptid}
+ and (bd.id = #{deptid} or bd.parent_id = #{deptid})
</if>
<if test="name!=null and name!=''">
and real_name like concat('%', #{name},'%')
--
Gitblit v1.9.3