拉取人员数据时，自动匹配会员角色，启用人员拉取定时任务（完成）

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

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<Sys_user_source> sources = dao.query(Sys_user_source.class, cnd.groupBy("loginname"));
         log.info("符合条件的数据源记录数: {}", sources.size());
@@ -181,6 +181,8 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
         List<String> addMemberUserIds = Collections.synchronizedList(new ArrayList<>());
         List<String> removeMemberUserIds = Collections.synchronizedList(new ArrayList<>());
 
+        List<String> 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);

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