update

src/controller/room/assistant.js

@@ -281,10 +281,10 @@ export class RoomAssistant {
         console.log("hasDuplicateUser-存在oid", user.oid);
         const hasDuplicateUser = await this.getOpenidInRoom(roomId, user.oid);
         if (hasDuplicateUser && hasDuplicateUser.length > 0) {
-          console.log("hasDuplicateUser-共有用户", hasDuplicateUser.length);
           const removeAll = [];
           Array.from(hasDuplicateUser).forEach((duplicateUser) => {
             if (duplicateUser.userId !== user.userId) {
+              console.log("duplicateUser-去重用户", duplicateUser);
               const deleteUserKey = `user:${duplicateUser.userId}`;
               console.log("deleteUserKey", deleteUserKey);
               removeAll.push(removeRoomUser(roomId, deleteUserKey));

src/controller/room/index.js

@@ -88,15 +88,14 @@ 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)) {
+      if (!this.isHoster(this.user.role) && assistantId) {
         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.isAssistant = 0;
-        }
+        this.logger.info("房间已存助手", assistantId, this.roomId);
+        userObj.isAssistant = Number(this.user.userId) === Number(assistantId) ? 1 : 0;
+        // if (assistantId) {
+        //   this.logger.info("已存在默认助手变更:" + "room助手ID: " + assistantId + " userId: " + this.user.userId);
+        // }
       }
 
       // if (assistantId && Number(this.userId) !== Number(assistantId) && !this.isHoster(this.user.role)) {