diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java index ada91b1..effed39 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalWriteController.java @@ -71,7 +71,10 @@ public class ProposalWriteController { @ApiOperation("保存提案") @SLog(tag = "提案管理系统-我的提案", msg = "保存提案") public Result save(@Param("info") ProposalInfo proposalInfo) { - if (StrUtil.isBlank(proposalInfo.getCode())) { + // 保存草稿允许表单未填完整,只有具备生成编号所需信息时才生成提案编号。 + if (StrUtil.isBlank(proposalInfo.getCode()) + && StrUtil.isNotBlank(proposalInfo.getSessionId()) + && StrUtil.isNotBlank(proposalInfo.getDelegationId())) { proposalInfo.setCode(proposalWriteService.generateProposalCode(proposalInfo.getSessionId(), proposalInfo.getDelegationId())); } dao.insertOrUpdate(proposalInfo); diff --git a/src/main/resources/static/components/plugins/sysUpload/h5Index.vue b/src/main/resources/static/components/plugins/sysUpload/h5Index.vue index e818518..dd913e3 100644 --- a/src/main/resources/static/components/plugins/sysUpload/h5Index.vue +++ b/src/main/resources/static/components/plugins/sysUpload/h5Index.vue @@ -1,10 +1,18 @@