Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -136,9 +136,8 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "设置密码")
 	@PostMapping(value = "/setPassword", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String"),
-			@ApiImplicitParam(name = "username", value = "用户名", required = true, dataType = "String") })
-	public Object setPassword(String password, String username) {
+	@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String")
+	public Object setPassword(String password) {
 		if (StringUtils.isEmpty(password)) {
 			return failed("参数校验失败");
 		}
@@ -150,18 +149,14 @@ public class UserController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户不存在");
 		}
-		if(sysUser.getUserType().contains("TEACHER") || sysUser.getUserType().contains("SYSTEM")){
-			sysUser.setRealName(username);
-		}else {
-			sysUser.setUsername(username);
-		}
 		if(StringUtils.isEmpty(sysUser.getImToken())){
+			String username = sysUser.getUsername();
+			if(sysUser.getUserType().contains("TEACHER") || sysUser.getUserType().contains("SYSTEM")){
+				username = sysUser.getRealName();
+			}
 			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), username, sysUser.getAvatar()));
 			sysUser.setImToken(register.getToken());
-		}else {
-			imFeignService.update(new ImUserModel(sysUser.getId().toString(),username,sysUser.getAvatar()));
 		}
-		webFeignService.updateNickName(sysUser.getId(),username);
 		password = new BCryptPasswordEncoder().encode(password);
 		sysUser.setPassword(password);
 		sysUser.setUpdateTime(new Date());

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

@@ -25,10 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -169,7 +166,14 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
 	@Override
 	public ImGroupMemberDto queryMember(String imGroupId, Integer userId) {
-		return imGroupDao.queryMember(imGroupId, userId);
+		ImGroupMemberDto imGroupMemberDto = imGroupDao.queryMember(imGroupId, userId);
+		if(Objects.isNull(imGroupMemberDto)){
+			imGroupMemberDto = imGroupDao.queryMember(null, userId);
+			if (Objects.nonNull(imGroupMemberDto)){
+				imGroupMemberDto.setRoleType(null);
+			}
+		}
+		return imGroupMemberDto;
 	}
 
 	@Override
@@ -202,6 +206,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     @Override
 	@Transactional(rollbackFor = Exception.class)
     public void updateImGroup(ImGroup imGroup) {
+		imGroup.setMemberNum(null);
 		imGroupDao.update(imGroup);
 		imFeignService.groupUpdate(new GroupModel(imGroup.getId(),null,imGroup.getName()));
     }

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

@@ -170,7 +170,14 @@
 	</select>
 	
 	<select id="queryMember" resultMap="ImGroupMemberDto" parameterType="map">
-		SELECT igm.*,u.avatar_,case when find_in_set('STUDENT',u.user_type_) then u.username_ else u.real_name_ end username_ FROM im_group_member igm left join sys_user u on igm.user_id_ = u.id_
-		where igm.im_group_id_ = #{imGroupId} and igm.user_id_ = #{userId}
+		SELECT igm.*,u.avatar_,CASE WHEN find_in_set('STUDENT',u.user_type_) THEN u.username_ ELSE u.real_name_ END username_
+		FROM im_group_member igm left join sys_user u on igm.user_id_ = u.id_
+		WHERE igm.user_id_ = #{userId}
+		<if test="imGroupId != null and imGroupId != ''">
+			AND igm.im_group_id_ = #{imGroupId}
+		</if>
+		<if test="imGroupId == null or imGroupId == ''">
+			LIMIT 1
+		</if>
 	</select>
 </mapper>