0428

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

@@ -687,7 +687,7 @@ public class ProRoleService implements IProRoleService {
         if ((isPm && power < WebConstant.ROLE_POWER.ADMIN_POWER.value) || (!isPm && power < WebConstant.ROLE_POWER.OPERATION_POWER.value)) {
             throw new BaseException(CodeEnum.NOT_POWER);
         }
-        if(CollectionUtil.isNotEmpty(saveMember.getMemberId())){
+//        if(CollectionUtil.isNotEmpty(saveMember.getMemberId())){
             //删除以前关联的成员
             ProMemberRoleExample memberRoleExample = new ProMemberRoleExample();
             memberRoleExample.createCriteria().andRoleIdEqualTo(saveMember.getRoleId());
@@ -707,7 +707,7 @@ public class ProRoleService implements IProRoleService {
                 proMemberRole.setMemberId(memberId);
                 memberRoleDao.insertSelective(proMemberRole);
             });
-        }
+//        }
 
 
 //        //检查成员是否为空

tall/src/main/resources/mapper_dao/ProMemberDao.xml

@@ -198,6 +198,7 @@
         (r.rec_status = 0 or r.rec_status is null)
         and
         m.project_id = #{projectId}
+        and mr.rec_status = 0
     </select>
 
     <select id="getMemberInfoByMemberId" parameterType="java.util.Map" resultMap="memberInfos">

tall/src/main/resources/mapper_dao/ProRoleDao.xml

@@ -82,8 +82,8 @@
             pr.relevance_project_id as relevanceProjectId,
             (SELECT `name` FROM t_sys_project WHERE id = pr.relevance_project_id) as relevanceProjectName
         from t_pro_role pr
-            LEFT JOIN t_pro_member_role mr ON mr.role_id = pr.id
+            LEFT JOIN t_pro_member_role mr ON mr.role_id = pr.id AND mr.rec_status = 0
-            LEFT JOIN t_pro_member m ON mr.member_id = m.id
+            LEFT JOIN t_pro_member m ON mr.member_id = m.id AND m.rec_status = 0
         where
             pr.project_id = #{projectId}
         and
@@ -92,8 +92,6 @@
             pr.name not IN	('全体成员','观众','MVP')
         AND
 	        pr.rec_status = 0
-	    AND (mr.rec_status = 0 or mr.rec_status is null)
-	    AND (m.rec_status = 0 or m.rec_status is null)
     </select>
     <select id="selectSecondRolesShowByProjectId" parameterType="java.util.Map"
             resultMap="resultMap_ProRoleInfo">