From ac4f938e324c1c4d133dac79965f936d97f4f941 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Thu, 18 Apr 2024 11:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdk/webservice/ManagerV2.cpp |  8 ++++----
 sdk/webservice/WSUser.cpp    | 12 +++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/sdk/webservice/ManagerV2.cpp b/sdk/webservice/ManagerV2.cpp
index cf001e2a..7dfcd21a 100644
--- a/sdk/webservice/ManagerV2.cpp
+++ b/sdk/webservice/ManagerV2.cpp
@@ -4485,10 +4485,6 @@ namespace ver_2
 			{
                 HGBase_SetImageDpi(img, p->m_dpi, p->m_dpi);
 
-				HGBool blank = HGFALSE;
-				if (p->m_scanBlankCheck)
-					HGImgProc_ImageBlankCheck(img, NULL, &blank);
-
 				HGBase_EnterLock(p->m_lock);
 				std::string imagePath;
                 int ret = p->SaveImage(img, !p->m_scanLocalSave, imagePath);
@@ -4509,6 +4505,10 @@ namespace ver_2
 						}
 					}
 
+                    HGBool blank = HGFALSE;
+                    if (p->m_scanBlankCheck)
+                        HGImgProc_ImageBlankCheck(img, NULL, &blank);
+
                     std::list<class WSUser *>::iterator iter;
                     for (iter = p->m_user.begin(); iter != p->m_user.end(); ++iter)
                     {
diff --git a/sdk/webservice/WSUser.cpp b/sdk/webservice/WSUser.cpp
index 66be0ebe..7b9c471e 100644
--- a/sdk/webservice/WSUser.cpp
+++ b/sdk/webservice/WSUser.cpp
@@ -924,13 +924,6 @@ namespace ver_2
 	{
 		WSUser* p = (WSUser*)param;
 
-		std::string base64;
-        if (getBase64)
-		{
-			std::string errInfo;
-			p->GetManager()->LoadLocalImage(path, base64, errInfo);
-		}
-
 		cJSON *retJson = cJSON_CreateObject();
 		if (NULL != retJson)
 		{
@@ -950,7 +943,12 @@ namespace ver_2
 				cJSON_AddItemToObject(retJson, "image_path", cJSON_CreateString(StdStringToUtf8(path).c_str()));
 
             if (getBase64)
+            {
+                std::string base64;
+                std::string errInfo;
+                p->GetManager()->LoadLocalImage(path, base64, errInfo);
 				cJSON_AddItemToObject(retJson, "image_base64", cJSON_CreateString(base64.c_str()));
+            }
 
 			char* resp = cJSON_Print(retJson);
 			if (NULL != resp)