diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteerModify.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteerModify.java index bb8f94df5..ad9b9e3f1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteerModify.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteerModify.java @@ -77,7 +77,7 @@ public class PlanAssignSteerModify extends BaseEntity { private Long createMan; @Schema(description = "审批状态: 0-草稿, 1-一级审批中, 2-审批通过, 3-审批驳回, 4-二级审批中") - private Integer approvalStatus = ApprovalStatus.DRAFT; + private Integer approvalStatus; @Schema(description = "附件") private String attachment; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java index 4ba62fd1c..754b2a90d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java @@ -96,19 +96,30 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl modifyLst = null; - PlanAssignSteerModifyVO modifyVO = null; + List modifyLst = new ArrayList<>(); + PlanAssignSteerModifyVO modifyVO = new PlanAssignSteerModifyVO(); Boolean initSteer = false; if (pasmId != null) { - List entity = baseMapper.findByPasmId(pasmId); List list = baseMapper.findByPasmId(pasmId); - if (list.isEmpty()) { + if (Objects.isNull( list)) { return null; } @@ -406,7 +420,7 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl assignSteers = planAssignSteerService.list(Wrappers.lambdaQuery(PlanAssignSteer.class) .eq(PlanAssignSteer::getPlatingId, caId));