From d25e02a5a4bf76d7b929c83c906d748d07ef8ee9 Mon Sep 17 00:00:00 2001
From: qianyong325 <qianyong05@chinasoftinc.com>
Date: Mon, 26 May 2025 16:56:10 +0800
Subject: [PATCH] =?UTF-8?q?UDMF=E5=85=AC=E5=85=B1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=80=9A=E8=B7=AF=E5=8F=AF=E8=A7=81=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: qianyong325 <qianyong05@chinasoftinc.com>
---
 .../service/udmf/preprocess/preprocess_utils.cpp  |  1 +
 .../service/udmf/udmf_service_impl.cpp            | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp
index 9d553405e..a182ba3eb 100644
--- a/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp
+++ b/services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp
@@ -72,6 +72,7 @@ int32_t PreProcessUtils::RuntimeDataImputation(UnifiedData &data, CustomOption &
     runtime.recordTotalNum = static_cast<uint32_t>(data.GetRecords().size());
     runtime.tokenId = option.tokenId;
     runtime.sdkVersion = GetSdkVersionByToken(option.tokenId);
+    runtime.visibility = option.visibility;
     data.SetRuntime(runtime);
     return E_OK;
 }
diff --git a/services/distributeddataservice/service/udmf/udmf_service_impl.cpp b/services/distributeddataservice/service/udmf/udmf_service_impl.cpp
index f48bb4953..835db3c9e 100644
--- a/services/distributeddataservice/service/udmf/udmf_service_impl.cpp
+++ b/services/distributeddataservice/service/udmf/udmf_service_impl.cpp
@@ -376,14 +376,19 @@ int32_t UdmfServiceImpl::GetBatchData(const QueryOption &query, std::vector<Unif
         ZLOGW("DataSet empty,key:%{public}s,intention:%{public}d", query.key.c_str(), query.intention);
         return E_OK;
     }
-    if (!IsFileMangerSa() && ProcessData(query, dataSet) != E_OK) {
+    for (auto &data : dataSet) {
+        if (query.intention == Intention::UD_INTENTION_DATA_HUB &&
+            data.GetRuntime()->visibility == VISIBILITY_OWN_PROCESS &&
+            query.tokenId != data.GetRuntime()->tokenId) {
+            continue;
+        } else {
+            unifiedDataSet.push_back(std::move(data));
+        }
+    }
+    if (!IsFileMangerSa() && ProcessData(query, unifiedDataSet) != E_OK) {
         ZLOGE("Query no permission.");
         return E_NO_PERMISSION;
     }
-    for (auto &data : dataSet) {
-        PreProcessUtils::SetRemoteData(data);
-        unifiedDataSet.push_back(data);
-    }
     return E_OK;
 }
 
-- 
Gitee