From fb981e36e0c8a4a32f37edbce1b8409d75b0f842 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 25 Aug 2021 10:03:55 +0800
Subject: [PATCH] 1.单位

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |   11 +++++++----
 1 files changed, 7 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 185feb4..290a509 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.information.mapper.InformationMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="informationResultMap" type="org.springblade.modules.information.entity.Information">
+    <resultMap id="informationResultMap" type="org.springblade.modules.information.vo.InformationVO">
         <id column="id" property="id"/>
         <result column="creditCode" property="creditcode"/>
         <result column="enterpriseName" property="enterprisename"/>
@@ -28,6 +28,9 @@
         <result column="contactscell" property="contactscell"/>
         <result column="businessLicense" property="businessLicense"/>
         <result column="licence" property="licence"/>
+        <result column="znum" property="znum"/>
+        <result column="cnum" property="cnum"/>
+        <result column="pnum" property="pnum"/>
         <result column="fregion" property="fregion"/>
         <result column="ftime" property="ftime"/>
     </resultMap>
@@ -41,9 +44,9 @@
         IFNULL(C.pnum ,0) as pnum
         FROM
         sys_information i
-        LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND is_deleted = 0 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
-        LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND is_deleted = 0 AND hold=1 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
-        LEFT JOIN ( SELECT COUNT( * ) AS pnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND is_deleted = 0 AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
+        LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586'  AND status=1  GROUP BY dept_id ) A ON A.dept_id = i.departmentid
+        LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586'  AND status=1  AND hold=1 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
+        LEFT JOIN ( SELECT COUNT( * ) AS pnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586'  AND status=1  AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
         where  1=1
         <if test="information.enterprisename!=null and information.enterprisename!=''">
             and i.enterpriseName like concat(concat('%', #{information.enterprisename}),'%')

--
Gitblit v1.9.3