diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java index 40bdaddc..9d70dc63 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java @@ -38,10 +38,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -356,13 +353,19 @@ public class BpmOAReimbursementServiceImpl extends BpmOABaseService implements B data.setDeptId(userRespDTO.getDeptId()); } + Set deptIds = convertSet(reimbursements, BpmOAReimbursementItemDO::getDeptId); + if (reimbursementDO.getPaymentCompany() != null) { + deptIds.add(reimbursementDO.getPaymentCompany()); + } //获取部门信息map - Map deptMap = deptApi.getDeptMap(convertSet(reimbursements, BpmOAReimbursementItemDO::getDeptId)); + Map deptMap = deptApi.getDeptMap(deptIds); List reimbursementDTOS = BeanUtils.toBean(reimbursements, ReimbursementDTO.class); BpmOAReimbursementRespVO bpmOAReimbursementRespVO = BeanUtils.toBean(reimbursementDO, BpmOAReimbursementRespVO.class); bpmOAReimbursementRespVO.setReimbursements(BpmOAReimbursementConvert.INSTANCE.convertList(reimbursementDTOS, deptMap)); //拼接数据 + // 设置付款公司名称 + bpmOAReimbursementRespVO.setPaymentCompanyName(deptMap.get(reimbursementDO.getPaymentCompany()) == null ? null : deptMap.get(reimbursementDO.getPaymentCompany()).getName()); return bpmOAReimbursementRespVO; }