From c63a153b3e3479fb3b09439aaaf9c7dd07d0f007 Mon Sep 17 00:00:00 2001
From: yangchaojin <549193112@qq.com>
Date: Fri, 23 Jan 2026 17:56:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Diwork=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integration/iwork/impl/IWorkSyncProcessorImpl.java     | 7 ++++++-
 .../integration/iwork/impl/IWorkSyncServiceImpl.java       | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java
index 4db5f260..50c1bd92 100644
--- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java
+++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncProcessorImpl.java
@@ -798,7 +798,12 @@ public class IWorkSyncProcessorImpl implements IWorkSyncProcessor {
         if (StrUtil.isBlank(statusFlag)) {
             return false;
         }
-        return !"0".equals(statusFlag.trim());
+        Integer status = parseInteger(statusFlag);
+        if (status == null) {
+            return false;
+        }
+        // iWork 状态：0试用、1正式、2临时、3试用延期、4解聘、5离职、6退休、7无效
+        return status >= 4;
     }
 
     private Integer resolveSex(String sexFlag) {
diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncServiceImpl.java
index 994471b9..dfb327a1 100644
--- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncServiceImpl.java
+++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncServiceImpl.java
@@ -260,10 +260,10 @@ public class IWorkSyncServiceImpl implements IWorkSyncService {
         if (query == null || reqVO == null) {
             return;
         }
+        copyQueryParameters(reqVO, query); // 设置查询条件
         if (StrUtil.isBlank(reqVO.getId())) {
             return;
         }
-        copyQueryParameters(reqVO, query); // 设置查询条件
         applyQueryId(query, reqVO.getId());
     }