From 284f77896327fb1b4849cb6e11e7d4f0804ec3a6 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Fri, 30 Sep 2022 15:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=B0=83=E6=95=B4,=E5=9C=A8?=
 =?UTF-8?q?=E5=B2=97=E6=95=B0=E5=85=B3=E8=81=94=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/organization/mapper/scheme/SchemeMapper.xml   | 2 +-
 .../organization/mapper/trigger/StaffTriggerMapper.java  | 4 +++-
 .../organization/mapper/trigger/StaffTriggerMapper.xml   | 9 +++++++++
 .../organization/thread/HrmResourceTriggerRunnable.java  | 4 +++-
 .../engine/organization/thread/StaffTriggerRunnable.java | 4 +---
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
index b47f9615..55ca3517 100644
--- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
@@ -77,7 +77,7 @@
     <select id="getTreeData" resultMap="TreeResultMap">
         select id, scheme_name,forbidden_tag
         from jcl_org_scheme
-        where delete_type = '0' and forbidden_tag = 0
+        where delete_type = '0' and forbidden_tag = 0 order by scheme_no
     </select>
     <select id="getSchemesByIds" resultMap="BaseResultMap">
         select
diff --git a/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.java b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.java
index 4f46e679..20652df2 100644
--- a/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.java
+++ b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.java
@@ -12,7 +12,9 @@ public interface StaffTriggerMapper {
 
     //Integer countDepartmentUsers(@Param("ecDepartmentId") String ecDepartmentId);
 
-    Integer countJobUsers(@Param("jobTitle") String jobTitle);
+    //Integer countJobUsers(@Param("jobTitle") String jobTitle);
+
+    Integer countOnJobByJObId(@Param("jobId") String jobId);
 
     //Integer countAllUsers();
 
diff --git a/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml
index 5577bf99..b9b402af 100644
--- a/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml
+++ b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml
@@ -95,4 +95,13 @@
           AND FDATEBEGIN &lt;= #{currentDate}
           AND FDATEEND &gt;= #{currentDate}
     </select>
+    <select id="countOnJobByJObId" resultType="java.lang.Integer">
+        select count(1)
+        from HrmResource a
+                 inner join cus_fielddata b on
+                    a.id = b.id
+                and b.scopeid = -1
+                and b.field100002 = #{jobId}
+        where a.status &lt; 3
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java
index f6ac0fd0..a555ba7d 100644
--- a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java
+++ b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java
@@ -89,7 +89,9 @@ public class HrmResourceTriggerRunnable implements Runnable {
                 // 更新当前架构图负责人的卡片信息
                 getHrmResourceTriggerMapper().updateLeaders(currentDate, hrmResource.getId().toString(), jclMap.getFLeaderImg(), jclMap.getFLeaderName(), jclMap.getFLeaderJobId(), jclMap.getFLeaderJob(), jclMap.getFLeaderLv(), jclMap.getFLeaderSt());
                 // 更新组织架构图在岗数
-                if (!jclMap.getFObjParentId().equals(jclOrgMapByObjID.getFObjParentId())) {
+                if (null == jclOrgMapByObjID) {
+                    new StaffTriggerRunnable(jclMap.getFObjParentId()).run();
+                } else if (!jclMap.getFObjParentId().equals(jclOrgMapByObjID.getFObjParentId())) {
                     new StaffTriggerRunnable(jclOrgMapByObjID.getFObjParentId()).run();
                     new StaffTriggerRunnable(jclMap.getFObjParentId()).run();
                 }
diff --git a/src/com/engine/organization/thread/StaffTriggerRunnable.java b/src/com/engine/organization/thread/StaffTriggerRunnable.java
index f7e75585..4e95e6be 100644
--- a/src/com/engine/organization/thread/StaffTriggerRunnable.java
+++ b/src/com/engine/organization/thread/StaffTriggerRunnable.java
@@ -15,7 +15,6 @@ import com.engine.organization.mapper.staff.StaffPlanMapper;
 import com.engine.organization.mapper.trigger.StaffTriggerMapper;
 import com.engine.organization.util.OrganizationDateUtil;
 import com.engine.organization.util.db.MapperProxyFactory;
-import com.engine.organization.util.relation.EcHrmRelationUtil;
 import org.apache.commons.lang3.StringUtils;
 import weaver.common.DateUtil;
 
@@ -164,8 +163,7 @@ public class StaffTriggerRunnable implements Runnable {
                 break;
             case "3":
                 planSum = getStaffTriggerMapper().countJobStaffNum(currentDate, objId);
-                String ecJobId = EcHrmRelationUtil.getEcJobId(Long.parseLong(objId));
-                onJobSum = getStaffTriggerMapper().countJobUsers(ecJobId);
+                onJobSum = getStaffTriggerMapper().countOnJobByJObId(objId);
             default:
                 break;
         }