update

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

@@ -107,8 +107,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 	@Transactional(rollbackFor = Exception.class)
 	public String createGroup(ImGroupDto imGroupDto){
 		List<String> userIdList = imGroupDto.getUserIdList();
+		Integer currentUserId = null;
 		if (CollectionUtils.isEmpty(userIdList)){
-			Integer currentUserId = sysUserFeignService.queryUserInfo().getId();
+			currentUserId = sysUserFeignService.queryUserInfo().getId();
 			userIdList.add(currentUserId.toString());
 		}
 		String groupName = imGroupDto.getGroupName();
@@ -121,6 +122,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 		imGroup.setId(groupId);
 		imGroup.setCreateTime(date);
 		imGroup.setIntroduce(groupName);
+		imGroup.setMemo(groupName);
 		imGroup.setMemberNum(userIdList.size());
 		imGroup.setName(groupName);
 		imGroup.setType(type);
@@ -128,6 +130,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 		imGroup.setUpdateTime(date);
 		imGroupDao.insert(imGroup);
 		List<ImGroupMember> groupMemberList = imGroupMemberDao.queryMembers(groupId, userIdList, TenantContextHolder.getTenantId());
+		if(currentUserId != null){
+			groupMemberList.get(0).setRoleType("乐团主管");
+		}
 		imGroupMemberDao.batchInsert(groupMemberList);
         Function<String,GroupMember> newGroup = userId ->new GroupMember(userId, groupId);
 		List<GroupMember> groupMembers =  userIdList.stream().map(newGroup).collect(Collectors.toList());

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

@@ -119,7 +119,7 @@
 				AND igm.user_id_ = #{userId}
 			</if>
 			<if test="search != null and search != ''">
-				AND (ig.name_ like concat('%',#{search},'%') or ig.tags_ like concat('%',#{search},'%'))
+				AND (ig.name_ like concat('%',#{search},'%') or ig.memo_ like concat('%',#{search},'%'))
 			</if>
 			<if test="ignoreIds != null and ignoreIds != ''">
 				AND NOT FIND_IN_SET(ig.id_,#{ignoreIds})