From fa782dca2a00e9a4a48c5b3588f5eb3b47af93cf Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 01 三月 2022 15:41:05 +0800
Subject: [PATCH] [update] [todo 136031] 諮詢度表現,提供前端該顧問所有預約單數量以及近一個月的預約單數量

---
 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