From 3b71b8fb08ab49997516c26d501134b5762cdb6f Mon Sep 17 00:00:00 2001
From: q30043944 <qinlong18@huawei.com>
Date: Thu, 15 May 2025 19:29:23 +0800
Subject: [PATCH] modify getTrustdeviceList

Signed-off-by: q30043944 <qinlong18@huawei.com>
---
 commondependency/src/deviceprofile_connector.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/commondependency/src/deviceprofile_connector.cpp b/commondependency/src/deviceprofile_connector.cpp
index 111b38c12..53badf197 100644
--- a/commondependency/src/deviceprofile_connector.cpp
+++ b/commondependency/src/deviceprofile_connector.cpp
@@ -607,7 +607,6 @@ std::vector<AccessControlProfile> DeviceProfileConnector::GetAclProfileByDeviceI
     return aclProfileVec;
 }
 
-
 std::vector<AccessControlProfile> DeviceProfileConnector::GetAclProfileByDeviceIdAndUserId(const std::string &deviceId,
     int32_t userId, const std::string &remoteDeviceId)
 {
@@ -629,8 +628,9 @@ std::vector<AccessControlProfile> DeviceProfileConnector::GetAclProfileByDeviceI
 DM_EXPORT std::unordered_map<std::string, DmAuthForm> DeviceProfileConnector::GetAppTrustDeviceList(
     const std::string &pkgName, const std::string &deviceId)
 {
-    int32_t userId = MultipleUserConnector::GetFirstForegroundUserId();
-    std::vector<AccessControlProfile> profiles = GetAclProfileByDeviceIdAndUserId(deviceId, userId);
+    int32_t userId = MultipleUserConnector::GetCurrentAccountUserID();
+    LOGI("localDeviceId: %{public}s, userId: %{public}d", GetAnonyString(deviceId).c_str(), userId);
+    std::vector<AccessControlProfile> profiles = GetAllAclIncludeLnnAcl();
     std::vector<AccessControlProfile> profilesFilter = {};
     for (auto &item : profiles) {
         if (!IsLnnAcl(item) && ((item.GetAccesser().GetAccesserUserId() == userId &&
@@ -650,6 +650,9 @@ std::unordered_map<std::string, DmAuthForm> DeviceProfileConnector::GetAuthFormM
     std::unordered_map<std::string, DmAuthForm> deviceIdMap;
     for (auto &item : profilesFilter) {
         std::string trustDeviceId = item.GetTrustDeviceId();
+        LOGI("trustDeviceId: %{public}s, status: %{public}d, acerUserId: %{public}d, aceeUserId: %{public}d",
+            GetAnonyString(trustDeviceId).c_str(), item.GetStatus(), item.GetAccesser().GetAccesserUserId(),
+            item.GetAccessee().GetAccesseeUserId());
         if (trustDeviceId == deviceId || item.GetStatus() != ACTIVE) {
             continue;
         }
-- 
Gitee