From cf2cdd37516e6c753a555a053400b77b4a2d962a Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 7 Apr 2021 18:01:46 +0800
Subject: [PATCH] 20210407v1.5

---
 .../ccsens/tall/service/ProRoleService.java   | 26 +++++++------------
 tall/src/main/resources/application.yml       |  4 +--
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
index 606a7a8a..553be54b 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
@@ -97,7 +97,7 @@ public class ProRoleService implements IProRoleService {
         //获取用户在项目中的角色
         List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, projectId, imitation);
 
-        //1.查询二级角色(项目经理+项目成员+mvp)
+        //1.查询二级角色(项目经理+项目成员+mvp)(所有二级角色)
         memberRoleList = getRealMemberRolesShowByProjectId(projectId,currentUserId);
 
         if (CollectionUtil.isNotEmpty(memberRoleList)) {
@@ -253,19 +253,19 @@ public class ProRoleService implements IProRoleService {
     }
     @Override
     public List<ProjectVo.RoleInfo> getRealMemberRolesShowByProjectId(Long projectId,Long userId) {
+        //返回的对象
+        List<ProjectVo.RoleInfo> memberRoleList = null;
+
         //先从userid和项目id获取当前用户的成员id，查看role-show里面是否有这个成员的数据
         ProMemberExample proMemberExample=new ProMemberExample();
         proMemberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId).andRecStatusEqualTo((byte)0);
         List<ProMember> proMembers = proMemberMapper.selectByExample(proMemberExample);
         Long memberId=0L;
         if(CollectionUtil.isNotEmpty(proMembers)){
-            if(proMembers.size()==1){
-                memberId=proMembers.get(0).getId();
-            }else {
-                throw new BaseException(CodeEnum.CHONGFU);
-            }
+            memberId=proMembers.get(0).getId();
         }else {
-            return proRoleDao.selectSecondRolesByProjectId(projectId);
+            memberRoleList = proRoleDao.selectSecondRolesByProjectId(projectId);
+            return memberRoleList;
         }
 
         //查看角色展示列表中是否有数据
@@ -291,7 +291,6 @@ public class ProRoleService implements IProRoleService {
                 });
             }
             //这里插入项目经理
-
            
             //查一下项目经理的角色id，
             ProRoleExample proRoleExample=new ProRoleExample();
@@ -353,14 +352,9 @@ public class ProRoleService implements IProRoleService {
                 }
             }
         }
-        //查询二级角色
-        List<ProjectVo.RoleInfo> memberRoleList;
-        memberRoleList = proRoleDao.selectSecondRolesShowByProjectId(projectId);
-
-        //TODO 查询项目配置，
-        if(CollectionUtil.isEmpty(memberRoleList)){
-            return memberRoleList;
-        }
+//        //查询二级角色
+//        memberRoleList = proRoleDao.selectSecondRolesShowByProjectId(projectId);
+        //在show表查找可见的角色
 
         return memberRoleList;
     }
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index ebc544af..b5408a3a 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common