From 3e46682706cae287d3c81a3273253d26e8997ae3 Mon Sep 17 00:00:00 2001 From: Paidax Date: Tue, 30 Sep 2025 15:41:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=20+=20=E5=B7=A5=E4=BC=9A?= =?UTF-8?q?=E5=B0=8F=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/controller/SysUnionGroupController.java | 9 +++++++-- .../app/sys/services/SysUnionGroupService.java | 3 ++- .../services/impl/SysUnionGroupServiceImpl.java | 16 +++++++++++----- .../controller/BuildHomeAgencyController.java | 2 +- .../MemberApplySchoolApprovalInterceptor.java | 2 ++ .../platform/sys/union/branchUnionGroupManage.js | 12 +++++++++--- 6 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/SysUnionGroupController.java b/src/main/java/com/budwk/app/sys/controller/SysUnionGroupController.java index 304467db..4230bbc0 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysUnionGroupController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysUnionGroupController.java @@ -21,8 +21,10 @@ import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; import javax.validation.Valid; +import java.util.Arrays; import java.util.List; @IocBean @@ -82,8 +84,11 @@ public class SysUnionGroupController { @At @SaCheckPermission("sys.manager.union") @ApiOperation("获取非工会小组组长人员") - public Result listUser(@Valid String unionId, String keyword) { - List list = sysUnionGroupService.listNotLeader(unionId, keyword); + public Result listUser(@Valid @Param("unionId") String unionId, + @Param("keyword") String keyword, + @Param("userIds") String[] userIds) { + System.out.println(Arrays.toString(userIds)); + List list = sysUnionGroupService.listNotLeader(unionId, keyword, Arrays.asList(userIds)); return Result.success(list); } diff --git a/src/main/java/com/budwk/app/sys/services/SysUnionGroupService.java b/src/main/java/com/budwk/app/sys/services/SysUnionGroupService.java index f542a603..8f063474 100644 --- a/src/main/java/com/budwk/app/sys/services/SysUnionGroupService.java +++ b/src/main/java/com/budwk/app/sys/services/SysUnionGroupService.java @@ -22,8 +22,9 @@ public interface SysUnionGroupService extends BaseService { * 查询非组长的成员 * @param unionId 分工会id * @param keyword 关键字 + * @param userIds 用户Id */ - List listNotLeader(String unionId, String keyword); + List listNotLeader(String unionId, String keyword, List userIds); /** * 分页查询 diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysUnionGroupServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysUnionGroupServiceImpl.java index b5331d64..a7188e06 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysUnionGroupServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysUnionGroupServiceImpl.java @@ -22,6 +22,7 @@ import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import java.util.List; @@ -72,14 +73,19 @@ public class SysUnionGroupServiceImpl extends BaseServiceImpl i } @Override - public List listNotLeader(String unionId, String keyword) { + public List listNotLeader(String unionId, String keyword, List userIds) { Sql sql = Sqls.create("select id,loginname,username,unitName from vw_user $condition limit 0,10"); Cnd cnd = Cnd.NEW(); cnd.and("unionId", "=", unionId); - SqlExpressionGroup seg = new SqlExpressionGroup(); - seg.orLike("username", keyword); - seg.orLike("loginname", keyword); - cnd.and(seg); + if (StrUtil.isNotBlank(keyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("username", keyword); + seg.orLike("loginname", keyword); + cnd.and(seg); + } else { + cnd.and("id", "in", userIds); + } + sql.setCondition(cnd); return listMap(sql); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeAgencyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeAgencyController.java index 6fa33812..ed814cdb 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeAgencyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeAgencyController.java @@ -194,7 +194,7 @@ public class BuildHomeAgencyController { @SaCheckPermission("buildHome.agency") @ApiOperation("获取非工会小组组长人员") public Result listUser(@Valid String keyword) { - List list = sysUnionGroupService.listNotLeader(SecurityUtil.getUnionId(), keyword); + List list = sysUnionGroupService.listNotLeader(SecurityUtil.getUnionId(), keyword, null); return Result.success(list); } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySchoolApprovalInterceptor.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySchoolApprovalInterceptor.java index e64beb52..38644777 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySchoolApprovalInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySchoolApprovalInterceptor.java @@ -47,6 +47,8 @@ public class MemberApplySchoolApprovalInterceptor implements FlowInterceptor { Sys_user sysUser = new Sys_user(); BeanUtil.copyProperties(record, sysUser); sysUser.setId(record.getUserId()); + sysUser.setMember(true); + sysUser.setWelfareMember(true); dao.updateIgnoreNull(sysUser); // 还要设置会员角色 diff --git a/src/main/resources/views/platform/sys/union/branchUnionGroupManage.js b/src/main/resources/views/platform/sys/union/branchUnionGroupManage.js index ffbada52..52b19956 100644 --- a/src/main/resources/views/platform/sys/union/branchUnionGroupManage.js +++ b/src/main/resources/views/platform/sys/union/branchUnionGroupManage.js @@ -113,8 +113,10 @@ const branchUnionGroupManage = { async onEdit(row) { this.formData = { ...row } + this.formData.unitIds = JSON.parse(row.unitIds) + this.formData.leaders = JSON.parse(row.leaders) await this.getUnits(row.id) - this.getUserOptions(row.leaderUserName) + this.getUserOptions(null, this.formData.leaders) this.dialogFormVisible = true this.$nextTick(() => { this.$refs.formRef.clearValidate() @@ -166,8 +168,12 @@ const branchUnionGroupManage = { }) }, - getUserOptions(keyword) { - $.get("/platform/sys/unionGroup/listUser", { keyword, unionId: this.union_id }).then((res) => { + getUserOptions(keyword, userIds = null) { + $.get("/platform/sys/unionGroup/listUser", { + keyword, + unionId: this.union_id, + userIds: JSON.stringify(userIds) + }).then((res) => { if (res.code === 0) { this.userOptions = res.data }