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 7dcda8c..0a3bbe9 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 @@ -129,13 +129,17 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService // return false; // } - if (!"在岗".equals(userState) && !"在岗-里仁学院".equals(userState)) { - return false; - } +// if (!"在岗".equals(userState) && !"在岗-里仁学院".equals(userState)) { +// return false; +// } +// +// // 判断聘用方式 +// Set memberPreparedByTypes = new HashSet<>(Arrays.asList("新人事代理", "校聘合同制", "事业编制")); +// return memberPreparedByTypes.contains(preparedBy); - // 判断聘用方式 - Set memberPreparedByTypes = new HashSet<>(Arrays.asList("新人事代理", "校聘合同制", "事业编制")); - return memberPreparedByTypes.contains(preparedBy); + + // 其他人员只需要判断在岗状态 + return "在岗".equals(userState) || "在岗-里仁学院".equals(userState); } /** diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java index 603effe..f992f88 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java @@ -71,30 +71,35 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic // 检查是否符合会员条件 // 1. 用户状态为"在岗" if ("在岗".equals(sysUser.getUserState()) || "在岗-里仁学院".equals(sysUser.getUserState())) { - // 2. 检查聘用方式条件 - List membershipQualifyingPreparedBy = Arrays.asList("新人事代理", "校聘合同制", "事业编制"); - - // 第一种情况:聘用方式在指定列表中 - boolean isQualifiedByPreparedBy = membershipQualifyingPreparedBy.contains(sysUser.getPreparedBy()); - - // 第二种情况:聘用方式是博士后,且进站时间不超过两年 - boolean isQualifiedPostdoc = false; -// if ("博士后".equals(sysUser.getPreparedBy()) && sysUser.getPostDoctoralJoinDate() != null) { -// Calendar twoYearsAgo = Calendar.getInstance(); -// twoYearsAgo.add(Calendar.YEAR, -2); -// Date twoYearsAgoDate = twoYearsAgo.getTime(); -// isQualifiedPostdoc = sysUser.getPostDoctoralJoinDate().after(twoYearsAgoDate); -// } - - // 如果满足任一条件,设置为会员 - if (isQualifiedByPreparedBy || isQualifiedPostdoc) { - sysUser.setMember(true); - } else { - sysUser.setMember(false); - } + sysUser.setMember(true); } else { sysUser.setMember(false); } +// if ("在岗".equals(sysUser.getUserState()) || "在岗-里仁学院".equals(sysUser.getUserState())) { +// // 2. 检查聘用方式条件 +// List membershipQualifyingPreparedBy = Arrays.asList("新人事代理", "校聘合同制", "事业编制"); +// +// // 第一种情况:聘用方式在指定列表中 +// boolean isQualifiedByPreparedBy = membershipQualifyingPreparedBy.contains(sysUser.getPreparedBy()); +// +// // 第二种情况:聘用方式是博士后,且进站时间不超过两年 +// boolean isQualifiedPostdoc = false; +//// if ("博士后".equals(sysUser.getPreparedBy()) && sysUser.getPostDoctoralJoinDate() != null) { +//// Calendar twoYearsAgo = Calendar.getInstance(); +//// twoYearsAgo.add(Calendar.YEAR, -2); +//// Date twoYearsAgoDate = twoYearsAgo.getTime(); +//// isQualifiedPostdoc = sysUser.getPostDoctoralJoinDate().after(twoYearsAgoDate); +//// } +// +// // 如果满足任一条件,设置为会员 +// if (isQualifiedByPreparedBy || isQualifiedPostdoc) { +// sysUser.setMember(true); +// } else { +// sysUser.setMember(false); +// } +// } else { +// sysUser.setMember(false); +// } } List> splitSysUsers = ListUtil.split(sysUsers, 500);