From e8a43c513da23b8b2aec0a09e602206b8b56ff5e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Dec 2021 15:42:07 +0800
Subject: [PATCH] 1.首页报错
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 106 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 82 insertions(+), 24 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..29c3ce8 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1248,7 +1248,8 @@
SELECT
IFNULL( V.num, 0 ) AS num,
IFNULL( B.cznum, 0 ) AS cznum,
- IFNULL( D.wpaiqnum, 0 ) AS wpaiqnum,
+ IFNULL( C.num, 0 ) AS paiqnum,
+ IFNULL( D.num, 0 ) AS wpaiqnum,
IFNULL( E.sbnum, 0 ) AS sbnum,
IFNULL( F.wcaijnum, 0 ) AS wcaijnum,
IFNULL( H.ycaijzpnum, 0 ) AS ycaijzpnum,
@@ -1316,31 +1317,87 @@
) B ON A.departmentid = B.dept_id
LEFT JOIN (
SELECT
- COUNT( * ) AS paiqnum,
- dept_id
+ L.znum+L.fznum as num,
+ L.dept_id
FROM
- blade_user
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
WHERE
- role_id = '1412226235153731586'
- AND STATUS = 1
- AND is_deleted = 0
- AND dispatch = 0
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ AND bu.dispatch = 0
GROUP BY
- dept_id
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ AND bu.dispatch = 0
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) L
) C ON C.dept_id = A.departmentid
LEFT JOIN (
SELECT
- COUNT( * ) AS wpaiqnum,
- dept_id
+ K.znum+K.fznum as num,
+ K.dept_id
FROM
- blade_user
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
WHERE
- role_id = '1412226235153731586'
- AND STATUS = 1
- AND is_deleted = 0
- AND dispatch = 1
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ AND bu.dispatch = 1
GROUP BY
- dept_id
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ AND bu.dispatch = 1
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) K
) D ON D.dept_id = A.departmentid
LEFT JOIN ( SELECT COUNT( * ) AS sbnum, deptid FROM sys_socil GROUP BY deptid ) E ON E.deptid = A.departmentid
LEFT JOIN (
@@ -1750,16 +1807,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 +3162,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,8 +3175,8 @@
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
- ON i.departmentid = d.dept_id
+ 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,
dept_id
--
Gitblit v1.9.3