|
|
@@ -361,13 +361,16 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
|
|
|
report.setBusinessObjects(reportData.getBusinessObjects());
|
|
|
}
|
|
|
if (ObjectUtil.isNotEmpty(report)) {
|
|
|
- //单独更新签字注师
|
|
|
- CwProjectReport cwProjectReport = new CwProjectReport();
|
|
|
- cwProjectReport.setSignatureAnnotator1(report.getSignatureAnnotator1());
|
|
|
- cwProjectReport.setSignatureAnnotator2(report.getSignatureAnnotator2());
|
|
|
- cwProjectReport.setSignatureAnnotatorStatus("0");
|
|
|
- cwProjectReportMapper.updatesigStatusById(cwProjectReport);
|
|
|
- cwProjectReportService.updateCwProjectReportDataById(report);
|
|
|
+ //如果签字注师为空,单独更新
|
|
|
+ if(StringUtils.isEmpty(reportData.getSignatureAnnotator1()) || StringUtils.isEmpty(reportData.getSignatureAnnotator2())){
|
|
|
+ CwProjectReport cwProjectReport = new CwProjectReport();
|
|
|
+ cwProjectReport.setSignatureAnnotator1(reportData.getSignatureAnnotator1());
|
|
|
+ cwProjectReport.setSignatureAnnotator2(reportData.getSignatureAnnotator2());
|
|
|
+ cwProjectReport.setSignatureAnnotatorStatus("0");
|
|
|
+ cwProjectReport.setId(reportData.getId());
|
|
|
+ cwProjectReportMapper.updatesigStatusById(cwProjectReport);
|
|
|
+ }
|
|
|
+ cwProjectReportService.updateCwProjectReportDataById(report);
|
|
|
}
|
|
|
}
|
|
|
mapper.updateReviewById(review);
|