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 e4b3314..a76aa08 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 unit_name from sys_user_source us left join sys_unit su ON su.id = us.unitId $condition"); + 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"); Cnd cnd = Cnd.NEW(); cnd.andEX(Sys_user_source::getPullTime, "=", pageForm.getPullTime()); cnd.and(Cnd.likeEX(Sys_user_source::getUsername, pageForm.getUserName())); @@ -57,7 +57,7 @@ public class SysDataUserPullController { } cnd.desc(Sys_user_source::getPullTime); sql.setCondition(cnd); - Pagination pagination = sysUserPullService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + Pagination pagination = sysUserPullService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); } diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java index f39a8b4..a0b13f1 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java @@ -124,7 +124,7 @@ public class SysDataUnitPullServiceImpl extends BaseServiceImpl implem } log.info("本次拉取单位数据，新增{}条，更新{}条", insertList.size(), updateList.size()); dao().insert(insertList); - dao().update(updateList); + dao().updateIgnoreNull(updateList); } 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 9f3a16a..78535cc 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 @@ -204,13 +204,13 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService u.setId(user.getId()); // 更新会员状态 - boolean currentIsMember = user.getMember() != null && user.getMember(); + /* boolean currentIsMember = user.getMember() != null && user.getMember(); if (!currentIsMember) { addMemberUserIds.add(user.getId()); } else{ removeMemberUserIds.add(user.getId()); - } + }*/ 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); } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveFamilyPlanningOfficeAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveFamilyPlanningOfficeAuditController.java index 4885be4..3b06c04 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveFamilyPlanningOfficeAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveFamilyPlanningOfficeAuditController.java @@ -167,6 +167,7 @@ public class MaternityLeaveFamilyPlanningOfficeAuditController { maternityLeaveService.update(maternityLeave); + args.put("argsUnitId",maternityLeave.getUnitId()); flowCommonService.executeTask(args); return Result.success(); diff --git a/src/main/resources/views/platform/sys/data/user/pull.html b/src/main/resources/views/platform/sys/data/user/pull.html index 5a3d2a8..ea007fc 100644 --- a/src/main/resources/views/platform/sys/data/user/pull.html +++ b/src/main/resources/views/platform/sys/data/user/pull.html @@ -80,13 +80,13 @@ layout("/layouts/platform.html"){ - - - - + + + + - + diff --git a/src/main/resources/views/platform/sys/data/user/update.html b/src/main/resources/views/platform/sys/data/user/update.html index 54a9fae..8868bbc 100644 --- a/src/main/resources/views/platform/sys/data/user/update.html +++ b/src/main/resources/views/platform/sys/data/user/update.html @@ -75,13 +75,13 @@ layout("/layouts/platform.html"){ - - - - + + + + - +