From a3c6c77d6b15fe65c54bc3d0da11e88cd0a07bde Mon Sep 17 00:00:00 2001 From: zhangrui Date: Mon, 26 Oct 2026 09:47:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA=E5=91=98=EF=BC=9A?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8C=B9=E9=85=8D=E6=9C=BA=E5=88=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/services/impl/SysDataUserAllUpdateServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 db5c738..f018e82 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 @@ -197,7 +197,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService u.setSalt(salt); u.setPassword(PwdUtil.getPassword(PwdUtil.generate(12), salt)); - if (u.getPersonType().equals("在编") || preparedByList.contains(u.getPreparedBy())) { + if (u.getUserState().equals("在职") && (u.getPersonType().equals("在编") || preparedByList.contains(u.getPreparedBy()))) { addMemberUserIds.add(u.getId()); u.setMember(true); } @@ -208,7 +208,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService u.setMember(null); u.setMemberTime(null); // 更新会员状态 - if (u.getPersonType().equals("在编") || preparedByList.contains(u.getPreparedBy())) { + if (u.getUserState().equals("在职") && (u.getPersonType().equals("在编") || preparedByList.contains(u.getPreparedBy()))) { if (!user.getMember()) { addMemberUserIds.add(u.getId()); u.setMember(true);