Browse Source

bug解决:未发起流程时,不查询审批记录

dongpo 7 months ago
parent
commit
8d0935025a

+ 4 - 3
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalSaveReqVO.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveR
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -15,12 +16,12 @@ public class OaUniversalSaveReqVO {
     @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.AUTO, example = "1")
     private Long id;
 
-    @Schema(description = "申请事项标题", example = "申请事项标题,最多20字")
-    @NotEmpty(message = "申请事项标题不能为空")
+    @Schema(description = "申请事项标题",  example = "申请事项标题,最多20字")
+    @NotBlank(message = "申请事项标题不能为空")
     private String title;
 
     @Schema(description = "详细描述", example = "详细描述,最多200字")
-    @NotEmpty(message = "详细描述不能为空")
+    @NotBlank(message = "详细描述不能为空")
     private String description;
 
     @Schema(description = "备注", example = "备注,最多200字")

+ 4 - 2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalServiceImpl.java

@@ -403,8 +403,10 @@ public class OaUniversalServiceImpl implements OaUniversalService {
         oaUniversalRespVO.setFileList(fileList);
 
         // 审批记录
-        List<BpmTaskRespVO> auditRecordList = bpmTaskService.getAuditRecordListByProcessInstanceId(oaUniversalDO.getProcInstId());
-        oaUniversalRespVO.setAuditRecordList(auditRecordList);
+        if (StrUtil.isNotBlank(oaUniversalDO.getProcInstId())) {
+            List<BpmTaskRespVO> auditRecordList = bpmTaskService.getAuditRecordListByProcessInstanceId(oaUniversalDO.getProcInstId());
+            oaUniversalRespVO.setAuditRecordList(auditRecordList);
+        }
 
         // 审批人
         String startUserSelectAssignees = oaUniversalDO.getStartUserSelectAssignees();