From 3ca2cf682283d3f58be80f678efedbb91260d67c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Sep 2021 15:02:29 +0800
Subject: [PATCH] 从业记录,组织机构类别去除

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 2bb3321..bc35905 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -167,7 +167,11 @@
     <select id="selectHold" resultType="java.util.HashMap">
         SELECT
         IFNULL( A.thisnum, 0 ) AS cz,
-        IFNULL( B.lastnum, 0 ) AS wcz
+        A.czname,
+        A.czptime,
+        IFNULL( B.lastnum, 0 ) AS wcz,
+        B.wczname,
+        B.wczptime
         FROM
         (
         SELECT departmentid,jurisdiction FROM sys_information GROUP BY departmentid,jurisdiction
@@ -175,6 +179,8 @@
         LEFT JOIN(
         SELECT
         COUNT( * ) AS thisnum,
+        group_concat(real_name) AS czname,
+        group_concat(IFNULL(paper_time,0)) AS czptime,
         dept_id
         FROM
         blade_user
@@ -189,6 +195,8 @@
         LEFT JOIN (
         SELECT
         COUNT(*) AS lastnum,
+        group_concat(real_name) AS wczname,
+        group_concat(IFNULL(paper_time,0)) AS wczptime,
         dept_id
         FROM
         blade_user
@@ -290,7 +298,7 @@
         on
         si.departmentid = bd.id
         where 1=1
-        and bd.dept_category = 3
+        and si.stats = 1
         <if test="information.deptName!=null and information.deptName!=''">
             and bd.dept_name like concat(concat('%', #{information.deptName}),'%')
         </if>

--
Gitblit v1.9.3