From 448106417f30b8627e5947ecf7194688b8fe305a Mon Sep 17 00:00:00 2001
From: swj <1211312234@qq.com>
Date: Tue, 27 Sep 2022 10:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=A4=B4=E5=83=8F=E6=8E=A5=E5=8F=A3=E5=92=8C=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=E8=80=A6=E5=90=88=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=85=A5=E5=8F=82=E4=BC=A0=E9=94=99=E9=97=AE=E9=A2=98=20+=20?=
 =?UTF-8?q?=E7=BC=96=E5=88=B6=E6=8A=A5=E5=91=8A=E5=A4=84=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/controller/ExamineResultController.java            | 2 +-
 .../springblade/lims/service/impl/EntrustServiceImpl.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
index 8664574..9090611 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
@@ -1686,7 +1686,7 @@ public class ExamineResultController extends BladeController {
      * 上传检测结果照片
      */
     @PostMapping("/resultPicture")
-    public R<String> resultPicture(@RequestParam MultipartFile file, @RequestParam String examineId) {
+    public R<String> resultPicture(@RequestParam MultipartFile file, @RequestParam(required=false) String examineId) {
         return R.data(service.resultPicture(file, examineId));
     }
 }
\ No newline at end of file
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
index 623cd85..8c1e593 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
@@ -977,7 +977,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         // 图片路劲
         String path = sysClient.getParamValue("electronic_signature_real_path").getData();
         // 编制人签名
-        if (StringUtil.isBlank(entrust.getOrganizationBy())) {
+        if (StringUtil.isNotBlank(entrust.getOrganizationBy())) {
             User user = userClient.userInfoById(Long.parseLong(entrust.getOrganizationBy())).getData();
             ImageEntity farView = new ImageEntity();
             farView.setHeight(50);//设置高度
@@ -995,7 +995,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             result1.put("1", farView);
         }
         // 审核人签名
-        if (StringUtil.isBlank(entrust.getVerifyBy())) {
+        if (StringUtil.isNotBlank(entrust.getVerifyBy())) {
             User user = userClient.userInfoById(Long.parseLong(entrust.getVerifyBy())).getData();
             ImageEntity farView = new ImageEntity();
             farView.setHeight(50);//设置高度
@@ -1013,7 +1013,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             result1.put("2", farView);
         }
         // 审批人签名
-        if (StringUtil.isBlank(entrust.getApprovalBy())) {
+        if (StringUtil.isNotBlank(entrust.getApprovalBy())) {
             User user = userClient.userInfoById(Long.parseLong(entrust.getApprovalBy())).getData();
             ImageEntity farView = new ImageEntity();
             farView.setHeight(50);//设置高度