From 34b08e1c461f5e08675fcff95525956d7c4bef11 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:38:48 +0800
Subject: [PATCH] Merge branch 'Phase3' into pollex-dev
---
pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java
index 97669a7..8a757a4 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java
@@ -3,6 +3,7 @@
import static java.util.stream.Collectors.toList;
import java.util.List;
+import java.util.Objects;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,19 +18,19 @@
@Service
public class SatisfactionMapper {
-
+
@Autowired
ConsultantRepository consultantRepository;
-
+
@Autowired
CustomerRepository customerRepository;
-
+
public SatisfactionDTO toDTO(Satisfaction source) {
SatisfactionDTO target = new SatisfactionDTO();
BeanUtils.copyProperties(source, target);
target.setScore(source.getScore());
- Consultant consultant= consultantRepository.findOneByAgentNo(source.getAgentNo()).get();
- target.setAgentName(consultant.getName());
+ Consultant consultant= consultantRepository.findOneByAgentNo(source.getAgentNo()).orElse(null);
+ target.setAgentName(Objects.isNull(consultant) ? null : consultant.getName());
Customer customer = customerRepository.findById(source.getCustomerId()).get();
target.setCustomerName(customer.getName());
return target;
--
Gitblit v1.8.0