update

src/controller/room/assistant.js

@@ -284,9 +284,11 @@ export class RoomAssistant {
           console.log("hasDuplicateUser-共有用户", hasDuplicateUser.length);
           const removeAll = [];
           Array.from(hasDuplicateUser).forEach((duplicateUser) => {
-            const deleteUserKey = `user:${duplicateUser.userId}`;
-            console.log("deleteUserKey", deleteUserKey);
-            removeAll.push(removeRoomUser(roomId, deleteUserKey));
+            if (duplicateUser.userId !== user.userId) {
+              const deleteUserKey = `user:${duplicateUser.userId}`;
+              console.log("deleteUserKey", deleteUserKey);
+              removeAll.push(removeRoomUser(roomId, deleteUserKey));
+            }
           });
           const res = await Promise.all(removeAll);
           console.log("去重完成", res);

src/controller/room/index.js

@@ -87,18 +87,17 @@ export class RoomController extends BasicController {
 
       const userObj = { ...this.user, onlineStatus: 1, isConnected: true, order };
 
-      
-      // const assistantId = await this.roomAssistant.getRoomAssistant(this.roomId);
-      // if (!this.isHoster(this.user.role)) {
-      //   console.log("assistantId", assistantId);
-      //   console.log("this.userId", this.user.userId);
-      //   this.logger.info("默认变更条件:" + (assistantId && Number(this.user.userId) !== Number(assistantId)));
+      const assistantId = await this.roomAssistant.getRoomAssistant(this.roomId);
+      if (!this.isHoster(this.user.role)) {
+        console.log("assistantId", assistantId);
+        console.log("this.userId", this.user.userId);
+        this.logger.info("默认变更条件:" + (assistantId && Number(this.user.userId) !== Number(assistantId)));
 
-      //   if (assistantId && Number(this.user.userId) !== Number(assistantId)) {
-      //     this.logger.info("已存在默认助手变更:" + "room助手ID: " + assistantId + " userId: " + this.user.userId);
-      //     userObj.role = "customer";
-      //   }
-      // }
+        if (assistantId && Number(this.user.userId) !== Number(assistantId)) {
+          this.logger.info("已存在默认助手变更:" + "room助手ID: " + assistantId + " userId: " + this.user.userId);
+          userObj.isAssistant = 0;
+        }
+      }
 
       // if (assistantId && Number(this.userId) !== Number(assistantId) && !this.isHoster(this.user.role)) {
       //   userObj.role = "customer";