diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java index 8d2e9cc7..ad2e4fec 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java @@ -382,14 +382,13 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService Sql resetStatusSql = Sqls.create(""" UPDATE sys_user userInfo SET userInfo.pendingConfirmStatus = @noneStatus - WHERE userInfo.personType IN ('教职工', '劳务派遣人员') - AND userInfo.pendingConfirmStatus <> @noneStatus + WHERE userInfo.pendingConfirmStatus <> @noneStatus + AND userInfo.member='1' AND EXISTS ( SELECT 1 FROM sys_user_source sourceInfo WHERE sourceInfo.pullTime = @pullTime AND sourceInfo.loginname = userInfo.loginname - AND sourceInfo.personType IN ('教职工', '劳务派遣人员') ) """); resetStatusSql.setParam("noneStatus", PENDING_CONFIRM_STATUS_NONE); @@ -399,8 +398,8 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService Sql pendingStatusSql = Sqls.create(""" UPDATE sys_user userInfo SET userInfo.pendingConfirmStatus = @pendingStatus - WHERE userInfo.personType IN ('教职工', '劳务派遣人员') - AND IFNULL(userInfo.pendingConfirmStatus, @noneStatus) = @noneStatus + WHERE IFNULL(userInfo.pendingConfirmStatus, @noneStatus) = @noneStatus + AND userInfo.member='1' AND NOT EXISTS ( SELECT 1 FROM sys_user_source sourceInfo