|
@ -274,10 +274,17 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, |
|
|
*/ |
|
|
*/ |
|
|
public List<String> joint(String pids, String agencyId, List<IdAndNameDTO> list){ |
|
|
public List<String> joint(String pids, String agencyId, List<IdAndNameDTO> list){ |
|
|
List<String> orgIds = new ArrayList<>(); |
|
|
List<String> orgIds = new ArrayList<>(); |
|
|
|
|
|
if (StringUtils.isNotBlank(pids)){ |
|
|
list.forEach(l -> { |
|
|
list.forEach(l -> { |
|
|
String oneOrg = pids + ":" + agencyId + ":" + l.getId(); |
|
|
String oneOrg = pids + ":" + agencyId + ":" + l.getId(); |
|
|
orgIds.add(oneOrg); |
|
|
orgIds.add(oneOrg); |
|
|
}); |
|
|
}); |
|
|
|
|
|
}else {// pids为空的时候
|
|
|
|
|
|
list.forEach(l -> { |
|
|
|
|
|
String oneOrg = agencyId + ":" + l.getId(); |
|
|
|
|
|
orgIds.add(oneOrg); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
return orgIds; |
|
|
return orgIds; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|