diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java index c528cee1..1b8574e1 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java @@ -61,18 +61,19 @@ public class GroupManagementController { groupManagementVO.setGroupName(groupManagementQuery.getGroupName()); groupManagementVO.setEntId(groupManagementQuery.getEntId()); if (CollectionUtil.isNotEmpty(groupManagementEntityList)) { - groupManagementVO.setGroupType(groupManagementEntityList.get(0).getGroupType()); - groupManagementVO.setXhfNsrsbh(groupManagementEntityList.get(0).getXhfNsrsbh()); - groupManagementVO.setXhfMc(groupManagementEntityList.get(0).getXhfMc()); + GroupManagementEntity groupManagementEntity = groupManagementEntityList.stream().filter(t -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_1.getKey().equals(t.getDefaultItem())).findFirst().orElse(groupManagementEntityList.get(0)); + groupManagementVO.setGroupType(groupManagementEntity.getGroupType()); + groupManagementVO.setXhfNsrsbh(groupManagementEntity.getXhfNsrsbh()); + groupManagementVO.setXhfMc(groupManagementEntity.getXhfMc()); if(StringUtils.isBlank(groupManagementVO.getEntId())){ - groupManagementVO.setEntId(groupManagementEntityList.get(0).getEntId()); + groupManagementVO.setEntId(groupManagementEntity.getEntId()); } - groupManagementVO.setUsingEntId(groupManagementEntityList.get(0).getUsingEntId()); + groupManagementVO.setUsingEntId(groupManagementEntity.getUsingEntId()); List taxPayerVOList = new ArrayList<>(); - groupManagementEntityList.forEach(groupManagementEntity -> { + groupManagementEntityList.forEach(t -> { TaxPayerVO taxPayerVO = new TaxPayerVO(); - BeanUtils.copyProperties(groupManagementEntity, taxPayerVO); + BeanUtils.copyProperties(t, taxPayerVO); taxPayerVOList.add(taxPayerVO); });