From c62d8002bec6dfd520649a435085dc1f7e3ce147 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Dec 2021 10:36:19 +0800
Subject: [PATCH] 1.押运
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 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..1d58734 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},'%')
@@ -3104,7 +3105,7 @@
SELECT i.departmentid,
i.enterpriseName,
IFNULL(D.znum, 0) AS znum,
- IFNULL(d.num, 0) AS fwnum,
+ IFNULL(F.num, 0) AS fwnum,
IFNULL(B.cznum, 0) AS cznum,
IFNULL(C.sbnum, 0) AS sbnum
FROM sys_information i
@@ -3117,7 +3118,7 @@
AND is_deleted = 0
GROUP BY dept_id
) D ON D.dept_id = i.departmentid
- LEFT JOIN (SELECT COUNT(*) num, dept_id FROM sys_dispatcher_unit GROUP BY dept_id) d
+ LEFT JOIN (SELECT COUNT(*) num, dept_id FROM sys_dispatcher_unit GROUP BY dept_id) F
ON i.departmentid = d.dept_id
LEFT JOIN (
SELECT COUNT(*) AS cznum,
--
Gitblit v1.9.3