From 544dfc98e4de9ca79c6273db16f5078d40d39a10 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Wed, 5 Jul 2023 15:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=98=89=E5=85=86bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/organization/mapper/jclorgmap/JclOrgMapper.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
index fc52c6dd..903b053b 100644
--- a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
+++ b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
@@ -50,7 +50,7 @@
           AND FDATEEND &gt;= #{currentDate}
     </select>
     <select id="getSumPlanAndJobByFParentId" resultType="com.engine.organization.entity.map.JclOrgMap">
-        select sum(fplan) fplan,sum(fonjob) fonjob
+        select sum(isNull(fplan,0)) fplan,sum(isNull(fonjob,0)) fonjob
         from jcl_org_map
         where fparentid = #{fparentid}
           AND FDATEBEGIN &lt;= #{currentDate}
@@ -301,7 +301,7 @@
                                   fplan, fonjob, fisvitual, fdatebegin, fdateend)
         SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
                0, NULL, NULL, 0, NULL, -1, 0,
-               0, 0, 0, convert(varchar(100),getDate(),23), '2099-12-31' FROM hrmcompany
+               0, (select count(1) from hrmresource where status &lt; 4), 0, convert(varchar(100),getDate(),23), '2099-12-31' FROM hrmcompany
     </insert>
     <insert id="insertComToMap" databaseId="oracle">
         INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
@@ -309,7 +309,7 @@
                                   fplan, fonjob, fisvitual, fdatebegin, fdateend)
         SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
                0, NULL, NULL, 0, NULL, -1, 0,
-               0, 0, 0, TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') FROM hrmcompany
+               0, (select count(1) from hrmresource where status &lt; 4), 0, TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') FROM hrmcompany
     </insert>
     <insert id="insertComToMap" databaseId="mysql">
         INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname,
@@ -317,7 +317,7 @@
                                   fplan, fonjob, fisvitual, fdatebegin, fdateend)
         SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname,
                0, NULL, NULL, 0, NULL, -1, 0,
-               0, 0, 0, NOW(), '2099-12-31' FROM hrmcompany
+               0, (select count(1) from hrmresource where status &lt; 4), 0, NOW(), '2099-12-31' FROM hrmcompany
     </insert>
     <delete id="deleteJobNull">
         delete from jcl_org_map where ftype =3 and fdateend &gt; #{currentDate} and id not in (select a.FPARENTID from (select FPARENTID from jcl_org_map where ftype=4 and fdateend &gt; #{currentDate}) a)