From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit

---
 pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
index fd0ac35..275d246 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
@@ -5,6 +5,7 @@
 import com.pollex.pam.service.dto.ConsultantDetailDTO;
 import com.pollex.pam.service.dto.CustomerFavoriteConsultantDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -43,13 +44,14 @@
 
         consultantDTO.setContactStatus(null);
         consultantDTO.setUpdateTime(null);
-        consultantDTO.setLatestAppointmentId(null);
+//        consultantDTO.setLatestAppointmentId(null);
 
         return consultantDTO;
     }
 
     public ConsultantDetailDTO toDetailDto(Consultant source) {
         ConsultantDetailDTO consultantDetailDTO = new ConsultantDetailDTO();
+        BeanUtils.copyProperties(source, consultantDetailDTO);
         consultantDetailDTO.setName(source.getName());
         consultantDetailDTO.setAgentNo(source.getAgentNo());
         consultantDetailDTO.setRole(source.getRole());
@@ -63,7 +65,7 @@
         consultantDetailDTO.setAwards(source.getAward());
         consultantDetailDTO.setImg(source.getPhotoPath());
         consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
-        consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
+        consultantDetailDTO.setExperiences(source.getExperience());
 
         // todo 瘙箏����漲
         consultantDetailDTO.setSuitability(50);

--
Gitblit v1.8.0