From 6607c9a293233daf4e326c979fecd7c202243357 Mon Sep 17 00:00:00 2001
From: zhanhuasheng <zhanhuasheng@channelwill.cn>
Date: Mon, 27 May 2024 09:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E4=BE=8B=20-=20?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TestFile/setting/tag/tag_select2.py |  4 ++--
 YamlCase/setting/tag.yaml           | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/TestFile/setting/tag/tag_select2.py b/TestFile/setting/tag/tag_select2.py
index e6f8271..09a7d16 100644
--- a/TestFile/setting/tag/tag_select2.py
+++ b/TestFile/setting/tag/tag_select2.py
@@ -17,10 +17,10 @@ else:
     page_num = int(tag_location / 10) + 1
 setattr(tagData, 'page_num', int(page_num))
 
-tag_room_select_sql = f'select * from `im_room` where `cate_id` = {tagData.brandId} and `status` = 1 and `site_id` = {tagData.shopId} and `is_ignore` = 0 and room_type != 2 and last_msg_uid != {tagData.userId}'
+tag_room_select_sql = f'select * from `im_room` where `cate_id` = {tagData.brandId} and `status` = 1 and `site_id` = {tagData.shopId} and `is_ignore` = 0 and room_type != 2 and last_msg_uid != {tagData.userId} and from_id != ""'
 tag_room_select_result = tagData.new_db_coon.select_one_value(sql=tag_room_select_sql)
 room_id = tag_room_select_result['room_id']
-user_id = tag_room_select_result['last_msg_uid']
+user_id = tag_room_select_result['from_id']
 setattr(tagData, 'room_id', str(room_id))
 setattr(tagData, 'user_id', str(user_id))
 tagData.new_db_coon.close_db()
\ No newline at end of file
diff --git a/YamlCase/setting/tag.yaml b/YamlCase/setting/tag.yaml
index 1b47c41..8bb1f2e 100644
--- a/YamlCase/setting/tag.yaml
+++ b/YamlCase/setting/tag.yaml
@@ -95,15 +95,15 @@ api10:
     - eq: {"$.data.list[0].roomId": "${room_id}"}
     - eq: {"$.data.list[0].searchMatchDimeType": 7}
 
-#api11:
-#  title: 搜索用户标签
-#  url: /api/v1/chat/local/roomList
-#  method: post
-#  data: {"uid":"${userId}","uType":2,"platform":1,"siteIds":["${shopId}"],"status":1,"page":1,"pageSize":20,"sortName":"all","keyword":"${new_tag_name}","roomSearchExpArgs":{"searchDime":2,"searchId":""},"v":"${v}"}
-#  expected:
-#    - eq: {"$.code": 0}
-#    - eq: {"$.data.list[0].roomId": "${room_id}"}
-#    - eq: {"$.data.list[0].searchMatchDimeType": 12}
+api11:
+  title: 搜索用户标签
+  url: /api/v1/chat/local/roomList
+  method: post
+  data: {"uid":"${userId}","uType":2,"platform":1,"siteIds":["${shopId}"],"status":1,"page":1,"pageSize":20,"sortName":"all","keyword":"${new_tag_name}","roomSearchExpArgs":{"searchDime":2,"searchId":""},"v":"${v}"}
+  expected:
+    - eq: {"$.code": 0}
+    - eq: {"$.data.list[0].roomId": "${room_id}"}
+    - eq: {"$.data.list[0].searchMatchDimeType": 12}
 
 api12:
   title: 搜索标签 - all
-- 
GitLab