From 7d10b31a55134836acf00b9ed38c3968d532581d Mon Sep 17 00:00:00 2001 From: Paidax Date: Thu, 4 Dec 2025 17:14:31 +0800 Subject: [PATCH] =?UTF-8?q?pref#=5F=E5=B7=A5=E4=BC=9A=E5=B9=B2=E9=83=A8?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/budwk/app/sys/controller/SysUnionController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 87337ae..358d160 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysUnionController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysUnionController.java @@ -291,6 +291,7 @@ public class SysUnionController { LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10 LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id $condition + $constructionSql """); Cnd cnd = Cnd.where("role.`code`", "in", branchUnionRoleCodes); @@ -302,8 +303,11 @@ public class SysUnionController { case "roleName" -> cnd.where().andLike("role.`name`", pageForm.getSearchKeyword()); } } - cnd.and(new Static("1=1 order by field(role.code," + branchUnionRoleCodes.stream().map(code -> "'" + code + "'").collect(Collectors.joining(",")) + ")")); sql.setCondition(cnd); + + sql.setVar("constructionSql", + new Static(" group by info.id order by field(role.code," + branchUnionRoleCodes.stream().map(code -> "'" + code + "'").collect(Collectors.joining(",")) + ")") + ); List list = sysUserService.listMap(sql); return Result.success(list); }