Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

@@ -871,13 +871,7 @@ public class ProRoleService implements IProRoleService {
         //获取经理角色id
         ProRoleExample proRoleExample=new ProRoleExample();
         proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(param.getParam().getProjectId());
-//        //一级角色项目经理
-//        List<Long> jili=proRoleMapper.selectByExample(proRoleExample).stream().map(action->action.getId()).collect(Collectors.toList());
-//        //二级角色项目经理
-//        ProRoleExample proRoleExample1=new ProRoleExample();
-//        proRoleExample1.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(jili);
-//        List<ProRole> proRoles = proRoleMapper.selectByExample(proRoleExample1);
-//        List<Long> jili1=proRoles.stream().map(action->action.getId()).collect(Collectors.toList());
+
 
         List<Long> jili1 = proRoleDao.getPmByByProjectId(param.getParam().getProjectId());
 
@@ -888,6 +882,8 @@ public class ProRoleService implements IProRoleService {
 //        List<RoleVo.JueSeByProId> listBefor=proRoleDao.queryRoleShowslistAfter(memberId);
         //查询已添加的角色和项目虚拟角色
         List<RoleVo.JueSeByProId> listBefor = proRoleDao.queryRoleSHowsForRoleAndProject(memberId);
+        //TODO 未查到已添加的角色，查询全部的
+
         List<Long> listBeforeId= listBefor.stream().map(action ->{return action.getId();}).collect(Collectors.toList());
         for (int i = 0; i < listBefor.size(); i++) {
             //普通角色

tall/src/main/java/com/ccsens/tall/service/UserService.java

@@ -761,8 +761,8 @@ public class UserService implements IUserService {
                     if (ObjectUtil.isNull(member.getUserId()) || member.getUserId() == 0) {
                         member.setUserId(userId);
                         //将用户的昵称和头像复制到成员信息内
-                        member.setAvatarUrl(user.getAvatarUrl());
-                        member.setNickname(user.getNickname());
+//                        member.setAvatarUrl(user.getAvatarUrl());
+//                        member.setNickname(user.getNickname());
                         memberDao.updateByPrimaryKeySelective(member);
 
                         //用户关注这个项目