diff --git a/src/page/Meeting/UserListWindow/index.tsx b/src/page/Meeting/UserListWindow/index.tsx
index 4168865..6f29e5f 100644
--- a/src/page/Meeting/UserListWindow/index.tsx
+++ b/src/page/Meeting/UserListWindow/index.tsx
@@ -96,27 +96,6 @@ const UserListWindow: React.FC = () => {
- {item.uid !== user.uid && !role.ID.includes(item.roleId) ?
{
- if (item.isRoomManager) {
- channel.postMessage({
- type: 'userListWindowDeleteRoomManager',
- userListWindowDeleteRoomManager: {
- uid: item.uid
- }
- });
- } else {
- channel.postMessage({
- type: 'userListWindowPostRoomManager',
- userListWindowPostRoomManager: {
- uid: item.uid
- }
- });
- }
- }}>
- {!item.isRoomManager ?
-

:
-

}
-
: null}
{role.ID.includes(item.roleId) || item.isRoomManager ?

{
channel.postMessage({
@@ -184,6 +163,27 @@ const UserListWindow: React.FC = () => {
}} />
: null}
+ {item.uid !== user.uid && !role.ID.includes(item.roleId) ?
{
+ if (item.isRoomManager) {
+ channel.postMessage({
+ type: 'userListWindowDeleteRoomManager',
+ userListWindowDeleteRoomManager: {
+ uid: item.uid
+ }
+ });
+ } else {
+ channel.postMessage({
+ type: 'userListWindowPostRoomManager',
+ userListWindowPostRoomManager: {
+ uid: item.uid
+ }
+ });
+ }
+ }}>
+ {!item.isRoomManager ?
+

:
+

}
+
: null}
: null
)
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 931172a..db829da 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -2265,26 +2265,6 @@ const Meeting: React.FC = () => {
- {item.uid !== user.uid && !role.ID.includes(item.roleId) ?
{
- if (item.isRoomManager) {
- DeleteRoomManager({
- roomId: state.roomId,
- roomNum: state.channelId,
- userId: item.uid
- })
- } else {
- postRoomManager({
- roomId: state.roomId,
- roomNum: state.channelId,
- userId: item.uid
- })
- }
- }}>
- {!item.isRoomManager ?
-

:
-

- }
-
: null}
{role.ID.includes(item.roleId) || item.isRoomManager ?

{
postOpenMicr(!item.enableMicr, item.uid)
@@ -2320,6 +2300,26 @@ const Meeting: React.FC = () => {
: null}
+ {item.uid !== user.uid && !role.ID.includes(item.roleId) ?
{
+ if (item.isRoomManager) {
+ DeleteRoomManager({
+ roomId: state.roomId,
+ roomNum: state.channelId,
+ userId: item.uid
+ })
+ } else {
+ postRoomManager({
+ roomId: state.roomId,
+ roomNum: state.channelId,
+ userId: item.uid
+ })
+ }
+ }}>
+ {!item.isRoomManager ?
+

:
+

+ }
+
: null}
: null
)