diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberRoleDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberRoleDao.java index 0024797a..e7893446 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberRoleDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberRoleDao.java @@ -13,4 +13,11 @@ public interface ProMemberRoleDao extends ProMemberRoleMapper{ List selectUserIdByRoleId(Long roleId); List selectUserIdByProjectId(Long projectId); + + /** + * 查找memberRole表中干的数据,再填入memberRoleShow表中 + * @param memberId 成员id + * @return 成员角色信息 + */ + List selectMemberRoleShow(Long memberId); } 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 8dcd1318..dba00563 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/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 proMemberRoles = proMemberRoleMapper.selectByExample(proMemberRoleExample); +// ProMemberRoleExample proMemberRoleExample=new ProMemberRoleExample(); +// proMemberRoleExample.createCriteria().andMemberIdEqualTo(memberId).andRecStatusEqualTo((byte)0); +// List proMemberRoles = proMemberRoleMapper.selectByExample(proMemberRoleExample); + List 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]); diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index ebd289e6..8e23ed73 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/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)) { diff --git a/tall/src/main/resources/mapper_dao/ProMemberRoleDao.xml b/tall/src/main/resources/mapper_dao/ProMemberRoleDao.xml index 4f54dcac..d717ed22 100644 --- a/tall/src/main/resources/mapper_dao/ProMemberRoleDao.xml +++ b/tall/src/main/resources/mapper_dao/ProMemberRoleDao.xml @@ -40,4 +40,25 @@ and m.user_id != 0 GROUP BY m.user_id + + \ No newline at end of file