martial/martial-master
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(deduction): 修复扣分项编辑时赛事ID未携带的问题

Browse Source 
- 实体类添加competitionId字段
- Controller查询时从关联项目获取competitionId
- 修复project为null时的空指针异常
This commit is contained in:
宅房
2026-01-06 14:56:07 +08:00
parent 8193baf314
commit ac44bd45fa
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/springblade/modules/martial/controller/MartialDeductionItemController.java
View File

@@ -49,10 +49,13 @@ public class MartialDeductionItemController extends BladeController {
@Operation(summary = "分页列表", description = "分页查询") @Operation(summary = "分页列表", description = "分页查询")
public R<IPage<MartialDeductionItem>> list(MartialDeductionItem deductionItem, Query query) { public R<IPage<MartialDeductionItem>> list(MartialDeductionItem deductionItem, Query query) {
IPage<MartialDeductionItem> pages = deductionItemService.page(Condition.getPage(query), Condition.getQueryWrapper(deductionItem)); IPage<MartialDeductionItem> pages = deductionItemService.page(Condition.getPage(query), Condition.getQueryWrapper(deductionItem));
List<MartialDeductionItem> deductionItems = pages.getRecords(); List<MartialDeductionItem> deductionItems = pages.getRecords();
for (MartialDeductionItem item : deductionItems) { for (MartialDeductionItem item : deductionItems) {
MartialProject project = martialProjectService.getById(item.getProjectId()); 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); return R.data(pages);
} }

7
src/main/java/org/springblade/modules/martial/pojo/entity/MartialDeductionItem.java
View File

@@ -93,4 +93,11 @@ public class MartialDeductionItem extends TenantEntity {
@Schema(description = "项目名称") @Schema(description = "项目名称")
private String projectName; private String projectName;
/**
* 赛事ID
*/
@TableField(exist = false)
@Schema(description = "赛事ID")
private Long competitionId;
} }