From 541d76e377aa1ea3a164f8a387dd28ecbbd5670b Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 8 Jul 2026 17:26:03 +0800 Subject: [PATCH] commit --- .../controller/SysDataUserPullController.java | 3 ++- .../SysDataUserUpdateController.java | 2 +- .../sys/param/SysDataUserPullPageForm.java | 5 +++- .../impl/SysDataUserPullServiceImpl.java | 23 +++++++++++++++---- .../views/platform/sys/data/user/pull.html | 17 ++++++++++---- 5 files changed, 38 insertions(+), 12 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 1bb61fd..076b7a9 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java @@ -50,6 +50,7 @@ public class SysDataUserPullController { cnd.andEX(Sys_user_source::getUnitName, "=", pageForm.getUnitName()); cnd.andEX(Sys_user_source::getUserState, "=", pageForm.getUserState()); cnd.andEX(Sys_user_source::getPreparedBy, "=", pageForm.getPreparedBy()); + cnd.andEX(Sys_user_source::getEmploymentType, "=", pageForm.getEmploymentType()); cnd.andEX(Sys_user_source::getPersonType, "=", pageForm.getPersonType()); if (StrUtil.isAllNotBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { @@ -79,7 +80,7 @@ public class SysDataUserPullController { @At @SaCheckPermission("sys.data.user.pull") - @ApiModelProperty("获取下拉框数据(单位、在职状态、教职工类别)") + @ApiModelProperty("获取下拉框数据(单位、在职状态、编制类别、用人方式、教职工类别)") public Result searchOptions() { return Result.success(sysUserPullService.searchOptions()); } diff --git a/src/main/java/com/budwk/app/sys/controller/SysDataUserUpdateController.java b/src/main/java/com/budwk/app/sys/controller/SysDataUserUpdateController.java index 091080d..f76af14 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysDataUserUpdateController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysDataUserUpdateController.java @@ -86,7 +86,7 @@ public class SysDataUserUpdateController { cnd.and(Cnd.likeEX("u.loginname", pageForm.getLoginName())); cnd.andEX("u.unitId", "=", pageForm.getUnitId()); cnd.andEX("u.userState", "=", pageForm.getUserState()); - cnd.andEX("u.;preparedBy", "=", pageForm.getPreparedBy()); + cnd.andEX("u.preparedBy", "=", pageForm.getPreparedBy()); cnd.andEX("u.personType", "=", pageForm.getPersonType()); if (StrUtil.isAllNotBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); diff --git a/src/main/java/com/budwk/app/sys/param/SysDataUserPullPageForm.java b/src/main/java/com/budwk/app/sys/param/SysDataUserPullPageForm.java index b43b21e..116ad00 100644 --- a/src/main/java/com/budwk/app/sys/param/SysDataUserPullPageForm.java +++ b/src/main/java/com/budwk/app/sys/param/SysDataUserPullPageForm.java @@ -29,7 +29,10 @@ public class SysDataUserPullPageForm extends PageForm { @ApiModelProperty("教职工类别") private String personType; - @ApiModelProperty("用人方式") + @ApiModelProperty("编制类别") private String preparedBy; + @ApiModelProperty("用人方式") + private String employmentType; + } 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 b8d66b4..de619bb 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 @@ -272,6 +272,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl unitName, userState, preparedBy, + employmentType, personType FROM sys_user_source @@ -279,21 +280,35 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl unitName, userState, preparedBy, + employmentType, personType """); List list = listMap(sql); - List unitNames = list.stream().map(user -> user.getString("unitName")).distinct().toList(); - List userStates = list.stream().map(user -> user.getString("userState")).distinct().toList(); - List preparedBys = list.stream().map(user -> user.getString("preparedBy")).distinct().toList(); - List personTypes = list.stream().map(user -> user.getString("personType")).distinct().toList(); + List unitNames = cleanSearchOptions(list, "unitName"); + List userStates = cleanSearchOptions(list, "userState"); + List preparedBys = cleanSearchOptions(list, "preparedBy"); + List employmentTypes = cleanSearchOptions(list, "employmentType"); + List personTypes = cleanSearchOptions(list, "personType"); return NutMap.NEW() .addv("unitNames", unitNames) .addv("userStates", userStates) .addv("preparedBys", preparedBys) + .addv("employmentTypes", employmentTypes) .addv("personTypes", personTypes); } + /** + * 清理数据拉取页下拉选项，避免源表中的空值或前后空格生成无效筛选项。 + */ + private List cleanSearchOptions(List list, String fieldName) { + return list.stream() + .map(user -> StrUtil.trim(user.getString(fieldName))) + .filter(StrUtil::isNotBlank) + .distinct() + .toList(); + } + @Override public List pullTimeOptions() { Sql sql = Sqls.create(""" 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 51508e0..3549865 100644 --- a/src/main/resources/views/platform/sys/data/user/pull.html +++ b/src/main/resources/views/platform/sys/data/user/pull.html @@ -47,11 +47,16 @@ layout("/layouts/platform.html"){ - + + + + + + @@ -117,6 +122,7 @@ layout("/layouts/platform.html"){ unitNameOptions: [], userStateOptions: [], preparedByOptions: [], + employmentTypeOptions: [], personTypeOptions: [], pullTimeOptions: false, sourceTime: [], @@ -152,10 +158,11 @@ layout("/layouts/platform.html"){ getSearchOptions() { this.$axios.post("/platform/sys/data/user/pull/searchOptions").then((resp) => { if (resp.code === 0) { - this.unitNameOptions = resp.data.unitNames - this.userStateOptions = resp.data.userStates - this.personTypeOptions = resp.data.personTypes - this.preparedByOptions = resp.data.preparedBys + this.$set(this, "unitNameOptions", resp.data.unitNames) + this.$set(this, "userStateOptions", resp.data.userStates) + this.$set(this, "personTypeOptions", resp.data.personTypes) + this.$set(this, "preparedByOptions", resp.data.preparedBys) + this.$set(this, "employmentTypeOptions", resp.data.employmentTypes) } }) },