From 592a399d61ebaa74f0ce4d4d7dba925b69dfd831 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Tue, 24 Feb 2026 10:42:22 +0800 Subject: [PATCH] commit --- .../app/sys/controller/SysDataUserPullController.java | 2 +- .../services/impl/SysDataUserAllUpdateServiceImpl.java | 1 + .../impl/SysDataUserIncrUpdateServiceImpl.java | 10 +++++----- .../sys/services/impl/SysDataUserPullServiceImpl.java | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java b/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java index a76aa08..c983e1f 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java @@ -42,7 +42,7 @@ public class SysDataUserPullController { @ApiOperation("分页数据") @Ok("json:{locked:'password|idCard|mobile'}") public Result pageData(@Valid SysDataUserPullPageForm pageForm) { - Sql sql = Sqls.create("select us.*,su.`name` AS unitName from sys_user_source us left join sys_unit su ON su.id = us.unitId $condition"); + Sql sql = Sqls.create("select * from sys_user_source$condition"); Cnd cnd = Cnd.NEW(); cnd.andEX(Sys_user_source::getPullTime, "=", pageForm.getPullTime()); cnd.and(Cnd.likeEX(Sys_user_source::getUsername, pageForm.getUserName())); 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 78535cc..5d7844f 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 @@ -202,6 +202,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService } else { // 修改现有用户 u.setId(user.getId()); + u.setMember(null); // 更新会员状态 /* boolean currentIsMember = user.getMember() != null && user.getMember(); 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 78b3469..ee728d8 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 @@ -70,7 +70,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic // 检查是否符合会员条件 // 1. 用户状态为"在岗" - if ("在岗".equals(sysUser.getUserState())) { + /* if ("在岗".equals(sysUser.getUserState())) { // 2. 检查聘用方式条件 List membershipQualifyingPreparedBy = Arrays.asList("新人事代理", "校聘合同制", "事业编制"); @@ -94,7 +94,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic } } else { sysUser.setMember(false); - } + }*/ } List> splitSysUsers = ListUtil.split(sysUsers, 500); @@ -117,7 +117,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic sysRoleService.clearCache(); //比较单位数据 - List sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitLevel, "=", 2)); + /* List sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitLevel, "=", 2)); List sysUnitIds = sysUnits.stream().map(Sys_unit::getId).toList(); //信息中心的数据 转为单位代码 ->单位名称 map @@ -141,7 +141,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic }).toList(); ThreadUtil.execAsync(() -> { dao.insert(insertUnits); - }); + });*/ // 计算设置为会员的人数 long memberCount = sysUsers.stream().filter(Sys_user::getMember).count(); @@ -152,6 +152,6 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE)); } - return StrUtil.format("增量更新成功,本次更新新入职老师{}人,新增单位{}个,设置为会员{}人。", sysUsers.size(), insertUnits.size(), memberCount); + return StrUtil.format("增量更新成功,本次更新新入职老师{}人,新增单位{}个,设置为会员{}人。", sysUsers.size(), 0, memberCount); } } diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java index 42502b6..5fd5d5d 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java @@ -175,6 +175,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl // 设置单位相关信息 sysUser.setUnitId(raw.getStr("szdwdm")); + sysUser.setUnitName(raw.getStr("szksmc")); sysUser.setPullTime(nowDate); @@ -186,7 +187,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl dao().insert(latestSourceList); // 人员的单位数据和数据库的单位数据比较，如果人员里面有单位不存在，去更新单位数据 - List sourceUnitIds = latestSourceList.stream().map(Sys_user_source::getUnitId).distinct().toList(); + /* List sourceUnitIds = latestSourceList.stream().map(Sys_user_source::getUnitId).distinct().toList(); Sql sql = Sqls.create("select id from sys_unit group by id"); sql.setCallback(Sqls.callback.strList()); dao().execute(sql); @@ -195,7 +196,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl if (!new HashSet<>(unitIds).containsAll(sourceUnitIds)) { log.info("单位需要更新，正在同步更新"); sysDataUnitPullService.updateUnits(unitIds); - } + }*/ return nowDate; } catch (Exception e) { e.printStackTrace();