From c98c309d82cfce7aa42f1a3ec388ca7432eced21 Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 27 Mar 2026 14:52:31 +0800 Subject: [PATCH] commit --- .../java/com/budwk/app/sys/controller/SysUnionController.java | 2 +- .../controller/TeacherCongressDelegationController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/SysUnionController.java b/src/main/java/com/budwk/app/sys/controller/SysUnionController.java index 4568826..79d6acd 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysUnionController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysUnionController.java @@ -434,7 +434,7 @@ public class SysUnionController { public Result branchUnionPartUnitTransferData(String unionId) { // List units = dao.query(Sys_unit.class, Cnd.where("unitLevel", "=", 2).asc("unitcode")); // List units = dao.query(Sys_unit.class, Cnd.where("unitTypeCode", "=", "1").asc("unitcode")); - List units = dao.query(Sys_unit.class, Cnd.where("unitLevel", "=", "3").asc("unitcode")); + List units = dao.query(Sys_unit.class, Cnd.where("unitLevel", "=", "2").asc("unitcode")); List selectUnitIds = units.stream().filter(unit -> StrUtil.isNotBlank(unit.getUnionId()) && unit.getUnionId().equals(unionId)).map(Sys_unit::getId).toList(); List matchUnits = units.stream().filter(unit -> StrUtil.isBlank(unit.getUnionId()) || (StrUtil.isNotBlank(unit.getUnionId()) && unit.getUnionId().equals(unionId))).toList(); NutMap transferData = NutMap.NEW().addv("selectUnitIds", selectUnitIds).addv("allUnits", matchUnits); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java index fe7a8ba..499fecb 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java @@ -181,8 +181,8 @@ public class TeacherCongressDelegationController { seg.orEX("id", "not in", unitIds); seg.orEX("id", "in", selectUnitIds); -// Cnd cnd = Cnd.where("unitLevel", "=", 2); - Cnd cnd = Cnd.where("unitTypeCode", "=", "1"); + Cnd cnd = Cnd.where("unitLevel", "=", 2); +// Cnd cnd = Cnd.where("unitTypeCode", "=", "1"); if (!seg.isEmpty()) { cnd.and(seg); }