From cc4962fdfed92084ecded41b1033795a7eed8e49 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 23 Apr 2021 14:11:36 +0800
Subject: [PATCH] 20210423v1.0

---
 .../ccsens/tall/persist/dao/ProRoleDao.java    |  7 +++++++
 .../ccsens/tall/service/ProRoleService.java    | 18 ++++++++++--------
 tall/src/main/resources/application.yml        |  4 ++--
 .../main/resources/mapper_dao/ProRoleDao.xml   | 12 ++++++++++++
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java
index 7dd46322..53d9f3e9 100644
--- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java
+++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java
@@ -93,6 +93,13 @@ public interface ProRoleDao extends ProRoleMapper{
      */
     List<ProjectVo.RoleInfo> selectSecondRolesShowByRoleId(@Param("projectId") Long projectId,@Param("memberId") Long memberId);
 
+    /**
+     * 通过项目id查询项目经理的信息
+     * @param projectId
+     * @return
+     */
+    List<Long> getPmByByProjectId(@Param("projectId")Long projectId);
+
 //    /**
 //     * 查找项目下的所有成员的名字用“，”分隔
 //     * @param projectId 项目id
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 d3ac19d3..89b7fa86 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
@@ -784,13 +784,15 @@ 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> 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());
 
         //获取用户在项目中的角色
         List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(param.getUserId(), param.getParam().getProjectId(), 0);
@@ -1011,7 +1013,7 @@ public class ProRoleService implements IProRoleService {
         if(CollectionUtil.isNotEmpty(proMembers)&&proMembers.size()==1){
             memberId=proMembers.get(0).getId();
         }else {
-            throw new BaseException(CodeEnum.CHONGFU);
+//            throw new BaseException(CodeEnum.CHONGFU);
         }
         return memberId;
     }
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
 
diff --git a/tall/src/main/resources/mapper_dao/ProRoleDao.xml b/tall/src/main/resources/mapper_dao/ProRoleDao.xml
index e8f91887..ade94e23 100644
--- a/tall/src/main/resources/mapper_dao/ProRoleDao.xml
+++ b/tall/src/main/resources/mapper_dao/ProRoleDao.xml
@@ -371,5 +371,17 @@
       </if>
       order by tpr.sequence
     </select>
+    <select id="getPmByByProjectId" resultType="java.lang.Long">
+        SELECT
+        id
+        FROM
+        t_pro_role
+        WHERE
+        parent_id = (
+            SELECT id FROM t_pro_role WHERE project_id = #{projectId} and `name` = 'PM'
+        )
+        and
+        project_id = #{projectId}
+    </select>
 
 </mapper>
\ No newline at end of file