From d702c027cdb2d225ba3f44a2ff1e38e4c88d6434 Mon Sep 17 00:00:00 2001 From: shihao0303 <2936013465@qq.com> Date: Tue, 2 Dec 2025 16:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=E8=8A=82?= =?UTF-8?q?=E7=82=B9npe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Report/ReportFlowService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java b/src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java index 8342dcc..e3fcfd8 100644 --- a/src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java +++ b/src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java @@ -99,13 +99,13 @@ public class ReportFlowService extends ServiceImpl reportFlow.setApprover(queryParam.getApprover()); reportFlow.setApproverTime(LocalDateTime.now()); reportFlow.setApproverMessage(queryParam.getMessage()); - reportFlow.setApproverState(queryParam.getIsAudit() ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel()); + reportFlow.setApproverState(Boolean.TRUE.equals(queryParam.getIsAudit()) ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel()); baseMapper.updateById(reportFlow); if (!FlowEnum.Initial.getLabel().equals(project.getNode())) { //录入新审批记录 ReportFlow NextFlow = new ReportFlow(); - if (queryParam.getIsAudit()) { + if (Boolean.TRUE.equals(queryParam.getIsAudit())) { NextFlow.setReportId(queryParam.getReportId()); if(project.getNode().equals(FlowEnum.LeadInstance.getLabel())){ @@ -228,12 +228,12 @@ public class ReportFlowService extends ServiceImpl .last("limit 1")); reportFlow.setApproverTime(LocalDateTime.now()); reportFlow.setApproverMessage(queryParam.getMessage()); - reportFlow.setApproverState(queryParam.getIsAudit() ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel()); + reportFlow.setApproverState(Boolean.TRUE.equals(queryParam.getIsAudit()) ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel()); baseMapper.updateById(reportFlow); if (!FlowWarningEnum.state.getLabel().equals(record.getNode())) { //录入新审批记录 ReportFlow NextFlow = new ReportFlow(); - if (queryParam.getIsAudit()) { + if (Boolean.TRUE.equals(queryParam.getIsAudit())) { NextFlow.setReportId(queryParam.getReportId()); if (record.getNode().equals(FlowWarningEnum.leader.getLabel())) { NextFlow.setReportLink(FlowWarningEnum.end.getLabel()); @@ -334,13 +334,13 @@ public class ReportFlowService extends ServiceImpl .last("limit 1")); reportFlow.setApproverTime(LocalDateTime.now()); reportFlow.setApproverMessage(queryParam.getMessage()); - reportFlow.setApproverState(queryParam.getIsAudit() ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel()); + reportFlow.setApproverState(Boolean.TRUE.equals(queryParam.getIsAudit()) ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel()); baseMapper.updateById(reportFlow); if (!FlowWarningEnum.state.getLabel().equals(record.getInformState())) { //录入新审批记录 ReportFlow NextFlow = new ReportFlow(); //是否驳回 - if (queryParam.getIsAudit()) { + if (Boolean.TRUE.equals(queryParam.getIsAudit())) { NextFlow.setReportId(queryParam.getReportId()); if (record.getInformNode().equals(FlowWarningEnum.inform.getLabel())) { NextFlow.setReportLink(FlowWarningEnum.end.getLabel()); @@ -438,7 +438,7 @@ public class ReportFlowService extends ServiceImpl //接收人 informMessage.setRecipient(recipient); informMessage.setRecipientId(recipientId); - informMessage.setFlowState(queryParam.getIsAudit() ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel()); + informMessage.setFlowState(Boolean.TRUE.equals(queryParam.getIsAudit()) ? FlowStateEnum.End.getLabel() : FlowStateEnum.Reject.getLabel()); informMessageMapper.insert(informMessage); }