1.空针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/KeySiteServiceImpl.java

@@ -233,7 +233,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 				OrgPersonEnum.公司.getKey() + "," + OrgPersonEnum.部门.getKey(),
 				reginParams.getPersonIdentity().getBizOrgCode());
 		List<KeySite> keySiteList = this.list(new LambdaQueryWrapper<KeySite>().eq(BaseEntity::getIsDelete, false));
-		comDeptList = comDeptList.stream().map(c -> c.setTotal(keySiteList.stream()
+		comDeptList = comDeptList.stream().filter(u->StringUtils.isNotEmpty(u.getBizOrgCode())).map(c -> c.setTotal(keySiteList.stream()
 				.filter(k -> StringUtils.isNotBlank(k.getBizOrgCode()) && k.getBizOrgCode().contains(c.getBizOrgCode()))
 				.count())).collect(Collectors.toList());
 		List<OrgMenuDto> menuList = comDeptList.stream().map(o -> {
@@ -242,10 +242,9 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 			 * + o.getTotal() + ")", ObjectUtils.isEmpty(o.getParentId()) ? 0L :
 			 * Long.valueOf(o.getParentId()), o.getBizOrgType(), false, o.getBizOrgCode());
 			 */
-			OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
-					ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), false,
+			return new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
+					ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.parseLong(o.getParentId()), o.getBizOrgType(), false,
 					o.getBizOrgCode());
-			return menu;
 		}).collect(Collectors.toList());
 		return buildTreeParallel(menuList);
 	}