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);