|  | @@ -3,6 +3,9 @@ package com.ym.mec.biz.service.impl;
 | 
	
		
			
				|  |  |  import java.util.Date;
 | 
	
		
			
				|  |  |  import java.util.List;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +import com.ym.mec.auth.api.client.SysUserFeignService;
 | 
	
		
			
				|  |  | +import com.ym.mec.auth.api.entity.SysUser;
 | 
	
		
			
				|  |  | +import com.ym.mec.common.entity.ImUserModel;
 | 
	
		
			
				|  |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  |  import org.springframework.stereotype.Service;
 | 
	
		
			
				|  |  |  import org.springframework.transaction.annotation.Transactional;
 | 
	
	
		
			
				|  | @@ -38,6 +41,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 | 
	
		
			
				|  |  |  	@Autowired
 | 
	
		
			
				|  |  |  	private ImFeignService imFeignService;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +	@Autowired
 | 
	
		
			
				|  |  | +	private SysUserFeignService sysUserFeignService;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  	@Override
 | 
	
		
			
				|  |  |  	public BaseDAO<Long, ImGroup> getDAO() {
 | 
	
		
			
				|  |  |  		return imGroupDao;
 | 
	
	
		
			
				|  | @@ -120,8 +126,21 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	@Override
 | 
	
		
			
				|  |  | +	@Transactional(rollbackFor = Exception.class)
 | 
	
		
			
				|  |  |  	public int updateNickName(Integer userId, String nickName) {
 | 
	
		
			
				|  |  | -		return imGroupDao.updateNickname(userId,nickName);
 | 
	
		
			
				|  |  | +		//修改群成员备注
 | 
	
		
			
				|  |  | +		int i = imGroupDao.updateNickname(userId, nickName);
 | 
	
		
			
				|  |  | +		//修改sysUser名称,如果包含学员的角色,那么修改userName。否则修改realName
 | 
	
		
			
				|  |  | +		SysUser sysUser = sysUserFeignService.queryUserById(userId);
 | 
	
		
			
				|  |  | +		if(sysUser.getUserType().contains("STUDENT")){
 | 
	
		
			
				|  |  | +			sysUser.setUsername(nickName);
 | 
	
		
			
				|  |  | +		}else {
 | 
	
		
			
				|  |  | +			sysUser.setRealName(nickName);
 | 
	
		
			
				|  |  | +		}
 | 
	
		
			
				|  |  | +		sysUserFeignService.updateSysUser(sysUser);
 | 
	
		
			
				|  |  | +		//同步融云基本信息
 | 
	
		
			
				|  |  | +		imFeignService.update(new ImUserModel(sysUser.getId().toString(),nickName,sysUser.getAvatar()));
 | 
	
		
			
				|  |  | +		return i;
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  }
 |