修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -858,13 +858,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	public List<CompanyPerson> returnCompanyPerson(List<Long> ids) {
-		if (ids == null) return null;
+		if (ObjectUtils.isEmpty(ids)) return null;
 		return ids.stream().map(m -> {
 			OrgUsr org = getById(m);
+			if (ObjectUtils.isEmpty(org)) {
+				return null;
+			}
 			CompanyPerson company = new CompanyPerson();
 			BeanUtils.copyProperties(org, company);
 			company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey()));
 			return company;
+		}).filter(c -> {
+			return c != null;
 		}).collect(Collectors.toList());
 	}
 
@@ -874,6 +879,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	public OrgUsrDto getOrg(String amosUserId) {
 		OrgUsrDto person = queryForListByParentIdAndOrgType(amosUserId);
+		if (ObjectUtils.isEmpty(person)) {
+			return null;
+		}
 		return this.queryBySeq(Long.valueOf(person.getParentId()));
 	}