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

tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberRoleDao.java

@@ -13,4 +13,11 @@ public interface ProMemberRoleDao extends ProMemberRoleMapper{
     List<Long> selectUserIdByRoleId(Long roleId);
 
     List<Long> selectUserIdByProjectId(Long projectId);
+
+    /**
+     * 查找memberRole表中干的数据，再填入memberRoleShow表中
+     * @param memberId 成员id
+     * @return 成员角色信息
+     */
+    List<ProMemberRole> selectMemberRoleShow(Long memberId);
 }

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

@@ -299,15 +299,16 @@ public class ProRoleService implements IProRoleService {
         if(CollectionUtil.isEmpty(proMemberRoleShows)){
             Integer[] seq=new Integer[]{0};
             //需要从原表中导入数据
-            ProMemberRoleExample proMemberRoleExample=new ProMemberRoleExample();
-            proMemberRoleExample.createCriteria().andMemberIdEqualTo(memberId).andRecStatusEqualTo((byte)0);
-            List<ProMemberRole> proMemberRoles = proMemberRoleMapper.selectByExample(proMemberRoleExample);
+//            ProMemberRoleExample proMemberRoleExample=new ProMemberRoleExample();
+//            proMemberRoleExample.createCriteria().andMemberIdEqualTo(memberId).andRecStatusEqualTo((byte)0);
+//            List<ProMemberRole> proMemberRoles = proMemberRoleMapper.selectByExample(proMemberRoleExample);
+            List<ProMemberRole> proMemberRoles = memberRoleDao.selectMemberRoleShow(memberId);
             if(CollectionUtil.isNotEmpty(proMemberRoles)){
                 ProMemberRoleShow proMemberRoleShow=new ProMemberRoleShow();
                 Long finalMemberId = memberId;
 
                 proMemberRoles.forEach(action->{
-                    proMemberRoleShow.setId(action.getId());
+                    proMemberRoleShow.setId(snowflake.nextId());
                     proMemberRoleShow.setMemberId(finalMemberId);
                     proMemberRoleShow.setRoleId(action.getRoleId());
                     proMemberRoleShow.setSequence(++seq[0]);

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

@@ -438,6 +438,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     normalTask.setExecutorRoleName(executor.getName());
                 }
 
+                //设置默认检查人
                 Long checkerRole = normalTask.getCheckerRole();
                 ProRole checker = proRoleDao.selectByPrimaryKey(checkerRole);
                 if(ObjectUtil.isNotNull(checker)) {

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

@@ -40,4 +40,25 @@
 		and m.user_id != 0
 		GROUP BY m.user_id
   </select>
+
+    <select id="selectMemberRoleShow"  resultType="com.ccsens.tall.bean.po.ProMemberRole">
+    	SELECT
+            r.id AS roleId
+        FROM
+            t_pro_role AS r
+        LEFT JOIN t_pro_member_role AS mr ON mr.role_id = r.id
+        AND mr.rec_status = 0
+        WHERE
+            mr.member_id = #{memberId}
+        AND (
+                SELECT
+                    NAME
+                FROM
+                    t_pro_role pr
+                WHERE
+                    r.parent_id = pr.id
+                AND rec_status = 0
+            ) NOT IN ('MoneyStakeholder')
+        AND r.rec_status = 0
+  </select>
 </mapper>