From ac44bd45fac4af86ae82bf32476ce75bf4eb79d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Tue, 6 Jan 2026 14:56:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(deduction):=20=E4=BF=AE=E5=A4=8D=E6=89=A3?= =?UTF-8?q?=E5=88=86=E9=A1=B9=E7=BC=96=E8=BE=91=E6=97=B6=E8=B5=9B=E4=BA=8B?= =?UTF-8?q?ID=E6=9C=AA=E6=90=BA=E5=B8=A6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 实体类添加competitionId字段 - Controller查询时从关联项目获取competitionId - 修复project为null时的空指针异常 --- .../martial/controller/MartialDeductionItemController.java | 7 +++++-- .../modules/martial/pojo/entity/MartialDeductionItem.java | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialDeductionItemController.java b/src/main/java/org/springblade/modules/martial/controller/MartialDeductionItemController.java index daa8b00..bdbb393 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialDeductionItemController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialDeductionItemController.java @@ -49,10 +49,13 @@ public class MartialDeductionItemController extends BladeController { @Operation(summary = "分页列表", description = "分页查询") public R> list(MartialDeductionItem deductionItem, Query query) { IPage pages = deductionItemService.page(Condition.getPage(query), Condition.getQueryWrapper(deductionItem)); - List deductionItems = pages.getRecords(); + List deductionItems = pages.getRecords(); for (MartialDeductionItem item : deductionItems) { MartialProject project = martialProjectService.getById(item.getProjectId()); - item.setProjectName(project.getProjectName()); + if (project != null) { + item.setProjectName(project.getProjectName()); + item.setCompetitionId(project.getCompetitionId()); + } } return R.data(pages); } diff --git a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialDeductionItem.java b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialDeductionItem.java index f8df30b..dba23f4 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialDeductionItem.java +++ b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialDeductionItem.java @@ -93,4 +93,11 @@ public class MartialDeductionItem extends TenantEntity { @Schema(description = "项目名称") private String projectName; + /** + * 赛事ID + */ + @TableField(exist = false) + @Schema(description = "赛事ID") + private Long competitionId; + }