c-zhangr1/zhgh_zjipc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新人员：会员匹配机制调整

Browse Source
This commit is contained in:
c-zhangr1
2026-10-26 09:47:12 +08:00
parent 337bcd55bc
commit a3c6c77d6b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java
+2 -2
View File
@@ -197,7 +197,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
u.setSalt(salt); u.setSalt(salt);
u.setPassword(PwdUtil.getPassword(PwdUtil.generate(12), 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()); addMemberUserIds.add(u.getId());
u.setMember(true); u.setMember(true);
} }
@@ -208,7 +208,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
u.setMember(null); u.setMember(null);
u.setMemberTime(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()) { if (!user.getMember()) {
addMemberUserIds.add(u.getId()); addMemberUserIds.add(u.getId());
u.setMember(true); u.setMember(true);