From f7c381acbd83805db62530e19a3415f7ff7d3010 Mon Sep 17 00:00:00 2001 From: zhangrui Date: Tue, 1 Sep 2026 15:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8F=96=E4=BA=BA=E5=91=98=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=A7=92=E8=89=B2=EF=BC=8C=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=8B=89=E5=8F=96=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=88=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/budwk/app/sys/models/Sys_user.java | 2 +- .../impl/SysDataUserAllUpdateServiceImpl.java | 25 +++++++++++-------- .../app/task/job/SysUserAllRenewJob.java | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/models/Sys_user.java b/src/main/java/com/budwk/app/sys/models/Sys_user.java index 8444ae7..e7f9762 100644 --- a/src/main/java/com/budwk/app/sys/models/Sys_user.java +++ b/src/main/java/com/budwk/app/sys/models/Sys_user.java @@ -199,7 +199,7 @@ public class Sys_user extends BaseModel implements Serializable { @Column @Comment("编制类别码") @ColDefine(type = ColType.VARCHAR, width = 30) - @DataCenterColumn(name = "编制类型", key = "BZLB") + @DataCenterColumn(name = "编制类型", key = "yrxsmc") private String preparedBy; @Column 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 e2fa526..db5c738 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 @@ -163,9 +163,9 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService Cnd cnd = Cnd.where(Sys_user_source::getPullTime, "=", updateParam.getPullTime()); // 处理复杂条件 - if (updateParam.getConditionGroup() != null) { +// if (updateParam.getConditionGroup() != null) { // cnd = ConditionGroupUtil.applyConditionGroup(cnd, updateParam.getConditionGroup()); - } +// } List sources = dao.query(Sys_user_source.class, cnd.groupBy("loginname")); log.info("符合条件的数据源记录数: {}", sources.size()); @@ -181,6 +181,8 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService List addMemberUserIds = Collections.synchronizedList(new ArrayList<>()); List removeMemberUserIds = Collections.synchronizedList(new ArrayList<>()); + List preparedByList = List.of("人才市场派遣", "人力资源服务中心派遣", "海川派遣", "越仕中心", "柔性引进"); + // 处理每条数据 for (Sys_user_source source : sources) { Sys_user user = userMap.get(source.getLoginname()); @@ -195,8 +197,9 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService u.setSalt(salt); u.setPassword(PwdUtil.getPassword(PwdUtil.generate(12), salt)); - if (u.getMember()) { - //addMemberUserIds.add(u.getId()); + if (u.getPersonType().equals("在编") || preparedByList.contains(u.getPreparedBy())) { + addMemberUserIds.add(u.getId()); + u.setMember(true); } needInitUserList.add(u); } else { @@ -205,12 +208,14 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService u.setMember(null); u.setMemberTime(null); // 更新会员状态 - boolean currentIsMember = user.getMember() != null && user.getMember(); - - if (!currentIsMember) { - //addMemberUserIds.add(user.getId()); - } else{ - //removeMemberUserIds.add(user.getId()); + if (u.getPersonType().equals("在编") || preparedByList.contains(u.getPreparedBy())) { + if (!user.getMember()) { + addMemberUserIds.add(u.getId()); + u.setMember(true); + } + } else { + removeMemberUserIds.add(user.getId()); + u.setMember(false); } needDoUpdateList.add(u); diff --git a/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java b/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java index 6d20f36..4ca0a98 100644 --- a/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java +++ b/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java @@ -57,6 +57,6 @@ public class SysUserAllRenewJob implements Job { param.setUpdateMode(SysDataUpdateMode.ALL.name()); param.setConditionGroup(conditionGroup); - // sysDataUserUpdateService.update(param); + sysDataUserUpdateService.update(param); } }