From 5afc8c64cd27a1f01e481685ea8887fe6370e7ca Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 17:20:47 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=85=B7=E8=8E=B7=E5=8F=96=E5=BC=80=E7=A5=A8=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/impl/UserInfoServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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());