|
|
@@ -165,7 +165,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
|
|
|
for (CoreIntroduceLetterVo record : records) {
|
|
|
List<Long> orgIds = toOrgList.stream().filter(toOrg -> toOrg.getLetterId().equals(record.getId())).map(CoreIntroduceLetterToOrg::getOrgId).collect(Collectors.toList());
|
|
|
String orgNames = orgIds.stream().map(orgId -> {
|
|
|
- final SysOrg sysOrg = orgList.stream().filter(org -> org.getId().equals(orgId)).findFirst().get();
|
|
|
+ final SysOrg sysOrg = orgList.stream().filter(org -> org.getId().equals(orgId)).findFirst().orElse(null);
|
|
|
if (ObjectUtil.isNotEmpty(sysOrg)) {
|
|
|
if (StringUtil.isNullOrEmpty(sysOrg.getAffiliatedArea()) || (ObjectUtil.isNotNull(sysOrg.getType()) && sysOrg.getType() < 4) || sysOrg.getShortName().endsWith("地区行社")) {
|
|
|
return sysOrg.getShortName();
|