Merge branch 'zx_saas_imGroup' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/web/controller/ImGroupMemberController.java

@@ -59,7 +59,7 @@ public class ImGroupMemberController extends BaseController {
 				memberRole.setGroupId(k);
 				memberRole.setUserIds(v.stream().map(e->e.getUserId().toString()).collect(Collectors.toList()));
 				memberRole.setGroupRoleType(EImGroupRoleType.valueOf(v.get(0).getGroupRoleType()));
-				imGroupMemberService.groupMemberRole(memberRole);
+				imGroupMemberService.groupMemberRole1(memberRole);
 			});
 			return succeed();
 		}

mec-biz/src/main/java/com/ym/mec/biz/service/ImGroupMemberService.java

@@ -112,4 +112,6 @@ public interface ImGroupMemberService extends BaseService<Long, ImGroupMember> {
 
 	// 群成员身份设置
 	void groupMemberRole(ImGroupMemberWrapper.GroupMemberRole member);
+
+	void groupMemberRole1(ImGroupMemberWrapper.GroupMemberRole member);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupMemberServiceImpl.java

@@ -583,4 +583,28 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 			throw com.microsvc.toolkit.common.webportal.exception.BizException.from("群成员身份更新异常，请联系管理员!");
 		}
 	}
+
+	@Override
+	public void groupMemberRole1(ImGroupMemberWrapper.GroupMemberRole member) {
+		ImPluginService pluginService = imPluginContext.getPluginService();
+		try {
+			for (String userId : member.getUserIds()) {
+				switch (member.getGroupRoleType()) {
+					case Admin:
+						// 设置管理员
+						pluginService.groupAdminCreate(member.getGroupId(), userId);
+						break;
+					case Member:
+						// 取消管理员
+						pluginService.groupAdminRemove(member.getGroupId(), userId);
+						break;
+					default:
+						break;
+				}
+			}
+			imGroupMemberDao.batchUpdateGroupMemberRole(member.getGroupId(), member.getUserIds(), member.getGroupRoleType().getCode());
+		}catch (Exception e) {
+			log.error("群成员身份更新异常", e);
+		}
+	}
 }

mec-biz/src/main/resources/config/mybatis/ImGroupMemberMapper.xml

@@ -230,7 +230,7 @@
         </foreach>
     </select>
     <select id="groupRoleInit" resultType="com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper$GroupMemberRole1">
-		select im_group_id_ groupId,group_role_type_ groupRoleType,user_id_ userId from im_group_member where group_role_type_ = #{groupRoleType}
+		select im_group_id_ groupId,group_role_type_ groupRoleType,user_id_ userId from im_group_member where group_role_type_ = #{groupRoleType} order by id_ DESC
 	</select>
 
     <delete id="delByImGroupAndUserId">