diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index cff66791..a0d4fa7b 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -446,10 +446,11 @@ public class UserInfoServiceImpl implements UserInfoService { List entityList = groupManagementService.queryByGroupIdList(groupIdList); if (entityList != null && entityList.size() > 0) { //选出默认项 - Optional groupManagementEntityOptional = entityList.stream() - .filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())).findFirst(); - GroupManagementEntity groupManagementEntity = groupManagementEntityOptional.orElseGet(() -> entityList.get(0)); - if(StringUtils.isNotBlank(groupManagementEntity.getXhfNsrsbh())){ + List collect = entityList.stream() + .filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())).collect(Collectors.toList()); + GroupManagementEntity groupManagementEntity = null; + if(!collect.isEmpty()){ + groupManagementEntity = collect.get(0); deptEntityNew = new DeptEntity(); deptEntityNew.setDeptId(deptEntity.getDeptId()); deptEntityNew.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh());