diff --git a/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java b/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java index 578ea6b..18c5643 100644 --- a/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java +++ b/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java @@ -45,22 +45,40 @@ public class FlowController { } @GetMapping("/tasks/todo") - @Operation(summary = "待办列表", description = "按 assignee(用户)或 candidateGroup(候选组)查活动待办;不传则查全部活动待办") + @Operation(summary = "待办列表", description = "按 assignee(用户)或 candidateGroup(候选组,可多值)查活动待办;不传则查全部活动待办。" + + "assignee 与候选维度同传时为 OR 语义(我的待办=指派给我的 ∪ 我候选的)——网关按 JWT userId+roles 全量传参依赖此语义") public List todo( @RequestParam(required = false) String assignee, - @RequestParam(required = false) String candidateGroup, + @RequestParam(required = false) List candidateGroup, @RequestParam(required = false) String candidateUser, @RequestParam(defaultValue = "0") int firstResult, @RequestParam(defaultValue = "50") int maxResults) { + boolean hasAssignee = assignee != null && !assignee.isBlank(); + List groups = candidateGroup == null ? List.of() + : candidateGroup.stream().filter(g -> g != null && !g.isBlank()).collect(Collectors.toList()); + boolean hasCandidate = !groups.isEmpty() || (candidateUser != null && !candidateUser.isBlank()); + var q = taskService.createTaskQuery().active(); - if (assignee != null && !assignee.isBlank()) { + if (hasAssignee && hasCandidate) { + // F1-7 修复:原实现 assignee 与 candidateGroup 叠加为 AND,带角色的用户待办恒空。 + // Flowable or() 块内组合为 OR:指派给我的 ∪ 我(组)候选的。 + var or = q.or().taskAssignee(assignee); + if (!groups.isEmpty()) { + or = or.taskCandidateGroupIn(groups); + } + if (candidateUser != null && !candidateUser.isBlank()) { + or = or.taskCandidateUser(candidateUser); + } + q = or.endOr(); + } else if (hasAssignee) { q = q.taskAssignee(assignee); - } - if (candidateGroup != null && !candidateGroup.isBlank()) { - q = q.taskCandidateGroup(candidateGroup); - } - if (candidateUser != null && !candidateUser.isBlank()) { - q = q.taskCandidateUser(candidateUser); + } else if (hasCandidate) { + if (!groups.isEmpty()) { + q = q.taskCandidateGroupIn(groups); + } + if (candidateUser != null && !candidateUser.isBlank()) { + q = q.taskCandidateUser(candidateUser); + } } List dtos = q.orderByTaskCreateTime().desc() .listPage(firstResult, maxResults) diff --git a/flowable-service/src/main/resources/application.yml b/flowable-service/src/main/resources/application.yml index 2865a57..44a3ad6 100644 --- a/flowable-service/src/main/resources/application.yml +++ b/flowable-service/src/main/resources/application.yml @@ -1,5 +1,8 @@ server: port: 8089 + # F1-7 缓解:网关按 JWT roles 全量传 candidateGroup,多角色用户 URL 超 Tomcat 默认 8KB 上限。 + # 根治=F2-6 JWT/传参瘦身(roles 服务端解析),根治后回收此配置。 + max-http-request-header-size: 64KB spring: application: diff --git a/platform-app/src/main/resources/application-dev.yml b/platform-app/src/main/resources/application-dev.yml index 4740e4f..9c18598 100644 --- a/platform-app/src/main/resources/application-dev.yml +++ b/platform-app/src/main/resources/application-dev.yml @@ -10,6 +10,11 @@ # local 本地自举最小集(eip4m0),CI/对拍/单元测试,数据极简 # 默认 指向客户库副本 5435,验收验证/性能基线用,需网络 # ============================================================================ +server: + # F1-7 缓解:JWT 把全部角色塞进 claims,多角色用户(实测 ceshi 16,924 字符)超 Tomcat 默认 + # 8KB 请求头上限直接 400。根治=F2-6 JWT 瘦身(roles 不入令牌),根治后回收此配置。 + max-http-request-header-size: 64KB + spring: datasource: url: jdbc:postgresql://localhost:5433/eip4dev?currentSchema=eip3