|
|
@ -218,14 +218,16 @@ public class ProMemberService implements IProMemberService { |
|
|
|
@Override |
|
|
|
public List<Long> getMemberIdByProjectId(Long projectId) { |
|
|
|
List<Long> memberIdList = null; |
|
|
|
ProMemberExample memberExample = new ProMemberExample(); |
|
|
|
memberExample.createCriteria().andProjectIdEqualTo(projectId).andUserIdNotEqualTo(0L); |
|
|
|
List<ProMember> proMemberList = proMemberDao.selectByExample(memberExample); |
|
|
|
if(CollectionUtil.isNotEmpty(proMemberList)){ |
|
|
|
memberIdList = new ArrayList<>(); |
|
|
|
for(ProMember member : proMemberList){ |
|
|
|
if(ObjectUtil.isNotNull(member.getUserId()) && member.getUserId() != 0){ |
|
|
|
memberIdList.add(member.getUserId()); |
|
|
|
if(ObjectUtil.isNotNull(projectId)) { |
|
|
|
ProMemberExample memberExample = new ProMemberExample(); |
|
|
|
memberExample.createCriteria().andProjectIdEqualTo(projectId).andUserIdNotEqualTo(0L); |
|
|
|
List<ProMember> proMemberList = proMemberDao.selectByExample(memberExample); |
|
|
|
if (CollectionUtil.isNotEmpty(proMemberList)) { |
|
|
|
memberIdList = new ArrayList<>(); |
|
|
|
for (ProMember member : proMemberList) { |
|
|
|
if (ObjectUtil.isNotNull(member.getUserId()) && member.getUserId() != 0) { |
|
|
|
memberIdList.add(member.getUserId()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|