yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tsg' into tsg

master
cxw 2024-10-18 11:35:13 +08:00
parent 2d6cbfd0cb 931f9930ae
commit ae26aa6669
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java
View File

@ -71,7 +71,7 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
throw new IllegalArgumentException("当前培训日期标题名称重复"); throw new IllegalArgumentException("当前培训日期标题名称重复");
} }
if (planService.lambdaQuery().eq(PersonnelPlan::getId, dto.getPlanId()).count() == 0) { if (Objects.nonNull(dto.getPlanId()) && planService.lambdaQuery().eq(PersonnelPlan::getId, dto.getPlanId()).count() == 0) {
throw new IllegalArgumentException("培训计划不存在"); throw new IllegalArgumentException("培训计划不存在");
} }
dto.setId(IdWorker.getId()); dto.setId(IdWorker.getId());
@ -100,7 +100,7 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
if (query.count() > 0){ if (query.count() > 0){
throw new IllegalArgumentException("当前培训日期标题名称重复"); throw new IllegalArgumentException("当前培训日期标题名称重复");
} }
if (planService.lambdaQuery().eq(PersonnelPlan::getId, dto.getPlanId()).count() == 0) { if (Objects.nonNull(dto.getPlanId()) && planService.lambdaQuery().eq(PersonnelPlan::getId, dto.getPlanId()).count() == 0) {
throw new IllegalArgumentException("培训计划不存在"); throw new IllegalArgumentException("培训计划不存在");
} }

2
src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java
View File

@ -52,7 +52,7 @@ public class PersonnelPlanLog extends CommUpdate implements Serializable {
@TableField(value="plan_id") @TableField(value="plan_id")
@Schema(description="培训计划主键") @Schema(description="培训计划主键")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@NotNull(message = "培训计划不能为空",groups = {Insert.class, Update.class}) // @NotNull(message = "培训计划不能为空",groups = {Insert.class, Update.class})
private Long planId; private Long planId;
/** /**