caozixuan 3 years ago
parent
commit
0adb47c817

+ 14 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1759,8 +1759,20 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         if (Objects.isNull(third)){
             throw ExceptionResultEnum.ERROR.exception("未找到院长级审核记录");
         }
-        second.setRemark("通过," + second.getRemark());
-        third.setRemark("通过," + third.getRemark());
+        String secondRemark = second.getRemark();
+        if (SystemConstant.strNotNull(secondRemark)){
+            secondRemark = "通过," + secondRemark;
+        }else {
+            secondRemark = "通过";
+        }
+        String thirdRemark = third.getRemark();
+        if (SystemConstant.strNotNull(thirdRemark)){
+            thirdRemark = "通过," + thirdRemark;
+        }else {
+            thirdRemark = "通过";
+        }
+        second.setRemark(secondRemark);
+        third.setRemark(thirdRemark);
         approvalInfoList.add(second);
         approvalInfoList.add(third);