From fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 16:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
index c72da7d..b18bf11 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
@@ -132,7 +132,7 @@
 //                    boolean r = ftp.uploadInputstream(compressImg(is),fileName);
                     boolean r = ftp.uploadInputstream(is,fileName);
                     if(r){
-                        if(Constants.equalsInteger(isFace,Constants.ZERO)){
+                         if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
                             //楠岃瘉浜鸿劯璇勫垎
                             //浜鸿劯璇勫垎
                             FacePictureCheckRequest param = new FacePictureCheckRequest();
@@ -267,7 +267,7 @@
                     ALiYunUtil obs = new ALiYunUtil(endpoint,access_id, access_key);
                     if (obs.uploadOnlineObject(file.getInputStream(),bucketName, key,null)) {
                         // 绉诲姩鎴愬姛,杩斿洖鏂囦欢鍚�
-                        if(Constants.equalsInteger(isFace,Constants.ZERO)){
+                         if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
                             //楠岃瘉浜鸿劯璇勫垎
                             //浜鸿劯璇勫垎
                             FacePictureCheckRequest param = new FacePictureCheckRequest();

--
Gitblit v1.9.3