From ccbcb9487250f063dc7c4e72cfa18228dca8dac8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 六月 2025 12:05:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index cee28e5..eb2fc5e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -191,7 +191,7 @@
String fileName = folder+"/"+fName;
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();
@@ -231,6 +231,7 @@
// fileJSON.put("folder", folder);
fileJSON.put("url", prefixPath+fileName);
fileJSON.put("imgaddr", fName);
+ fileJSON.put("fileSize", file.getSize());
fileJSON.put("imgname", fileName);
fileJSON.put("originname", originname);
context.put("data",fileJSON);
--
Gitblit v1.9.3