From acdaa7825829a61920a369b600a7cf0285d55b63 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Mon, 14 Jul 2025 09:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cunkebao/controller/ContentLibraryController.php          | 4 ++--
 .../cunkebao/controller/friend/GetFriendListV1Controller.php  | 2 +-
 Server/application/job/WechatMomentsJob.php                   | 4 ++--
 Server/application/job/WorkbenchAutoLikeJob.php               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Server/application/cunkebao/controller/ContentLibraryController.php b/Server/application/cunkebao/controller/ContentLibraryController.php
index 3a445cfc..6c522a6d 100644
--- a/Server/application/cunkebao/controller/ContentLibraryController.php
+++ b/Server/application/cunkebao/controller/ContentLibraryController.php
@@ -886,8 +886,8 @@ class ContentLibraryController extends Controller
         $friendData = [];
         try {
             $toAccountId = '';
-            $username = Env::get('api.username', '');
-            $password = Env::get('api.password', '');
+            $username = Env::get('api.username2', '');
+            $password = Env::get('api.password2', '');
             if (!empty($username) || !empty($password)) {
                 $toAccountId = Db::name('users')->where('account',$username)->value('s2_accountId');
             }
diff --git a/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php b/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
index 89abde8c..86965d79 100644
--- a/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
+++ b/Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
@@ -47,7 +47,7 @@ class GetFriendListV1Controller extends BaseController
                 ->where(['d.companyId' => $this->getUserInfo('companyId'),'d.deleteTime' => 0]);
 
             if (!empty($deviceIds)){
-                $wechatIds = $wechatIds->where('d.deviceId','in',$deviceIds);
+                $wechatIds = $wechatIds->where('d.id','in',$deviceIds);
             }
             $wechatIds = $wechatIds->column('dwl.wechatId');
 
diff --git a/Server/application/job/WechatMomentsJob.php b/Server/application/job/WechatMomentsJob.php
index ad9f5345..2aabff4f 100644
--- a/Server/application/job/WechatMomentsJob.php
+++ b/Server/application/job/WechatMomentsJob.php
@@ -18,8 +18,8 @@ class WechatMomentsJob
     public function fire(Job $job, $data)
     {
         $toAccountId = '';
-        $username = Env::get('api.username', '');
-        $password = Env::get('api.password', '');
+        $username = Env::get('api.username2', '');
+        $password = Env::get('api.password2', '');
         if (!empty($username) || !empty($password)) {
             $toAccountId = Db::name('users')->where('account',$username)->value('s2_accountId');
         }else{
diff --git a/Server/application/job/WorkbenchAutoLikeJob.php b/Server/application/job/WorkbenchAutoLikeJob.php
index 5f656025..11c8d84c 100644
--- a/Server/application/job/WorkbenchAutoLikeJob.php
+++ b/Server/application/job/WorkbenchAutoLikeJob.php
@@ -209,8 +209,8 @@ class WorkbenchAutoLikeJob
     protected function processFriendMoments($workbench, $config, $friend)
     {
         $toAccountId = '';
-        $username = Env::get('api.username', '');
-        $password = Env::get('api.password', '');
+        $username = Env::get('api.username2', '');
+        $password = Env::get('api.password2', '');
         if (!empty($username) || !empty($password)) {
             $toAccountId = Db::name('users')->where('account',$username)->value('s2_accountId');
         }