流程审批生成附件

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowInfoServiceImpl.java

@@ -355,15 +355,14 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
                 });
         //项目负责人审核
         flowAudits.stream()
-                .filter(audit -> GeneStatusEnum.PROJECT_LEADER.getStatus().equals(audit.getFlowStatus()))
+                .filter(audit -> GeneStatusEnum.PROJECT_LEADER.getStatus().equals(audit.getFlowStatus()) && StrConstant.YES.equals(audit.getAuditResult()))
                 .findFirst()
                 .ifPresent(audit -> {
                     dataMap.put("projectLeaderDateStr", DateUtil.format(audit.getCreateTime(), DatePattern.CHINESE_DATE_PATTERN));
                     dataMap.put("projectLeaderSign", wordDataService.getBase64(audit.getCreateSign()));
-                    dataMap.put("leaderResult", false);
                     if (StrUtil.isNotBlank(audit.getAdditionalData())) {
                         JSONObject additionObj = JSON.parseObject(audit.getAdditionalData());
-                        dataMap.put("leaderResult", additionObj.getOrDefault("leaderResult", false));
+                        dataMap.put("leaderResult", StrConstant.YES.equals(additionObj.getOrDefault("leaderResult", "")));
                     }
                 });
         //基因编辑部门审核