提交

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

@@ -16,7 +16,9 @@ public interface IProRoleService {
 
     List<ProjectVo.RoleInfo> getRolesByProjectIdAndUserId(Long projectId, Long currentUserId,Integer imitation) throws Exception;
 
-    List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId,Long userId);
+    List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId);
+
+    List<ProjectVo.RoleInfo> getRealMemberRolesShowByProjectId(Long projectId,Long userId);
 
     int selectPowerByRoleName(Long userId,Long projectId);
 

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

@@ -92,7 +92,7 @@ public class ProRoleService implements IProRoleService {
         List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, projectId, imitation);
 
         //1.查询二级角色(项目经理+项目成员+mvp)
-        memberRoleList = getRealMemberRolesByProjectId(projectId,currentUserId);
+        memberRoleList = getRealMemberRolesShowByProjectId(projectId,currentUserId);
 
         if (CollectionUtil.isNotEmpty(memberRoleList)) {
             if (CollectionUtil.isNotEmpty(roleList)) {
@@ -232,9 +232,21 @@ public class ProRoleService implements IProRoleService {
 //        }
         return memberRoleList;
     }
+    @Override
+    public List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId) {
+        //查询二级角色
+        List<ProjectVo.RoleInfo> memberRoleList;
+        memberRoleList = proRoleDao.selectSecondRolesByProjectId(projectId);
 
+        //TODO 查询项目配置，
+        if(CollectionUtil.isEmpty(memberRoleList)){
+            return memberRoleList;
+        }
+
+        return memberRoleList;
+    }
     @Override
-    public List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId,Long userId) {
+    public List<ProjectVo.RoleInfo> getRealMemberRolesShowByProjectId(Long projectId,Long userId) {
         //先从userid和项目id获取当前用户的成员id，查看role-show里面是否有这个成员的数据
         ProMemberExample proMemberExample=new ProMemberExample();
         proMemberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId).andRecStatusEqualTo((byte)0);

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common