From 5228a259ff7e0ddf430c58294749f3afcfaa246f Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 08 十一月 2021 16:03:03 +0800
Subject: [PATCH] fixed: 1. 開啟popup html仍可滾動 2. 開啟el-dialog body增加 padding-right 的問題
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
index e71667b..b9fbf53 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -10,6 +10,8 @@
import com.pollex.pam.service.mapper.ConsultantMapper;
import com.pollex.pam.web.rest.errors.ConsultantNotFoundException;
import com.pollex.pam.web.rest.errors.NotLoginException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +21,8 @@
@Service
public class ConsultantService {
+
+ private final static Logger log = LoggerFactory.getLogger(ConsultantService.class);
private final ConsultantRepository consultantRepository;
private final CustomFavoriteConsultantRepository customFavoriteConsultantRepository;
@@ -77,12 +81,19 @@
User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new);
consultants.forEach(consultant -> {
- CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
- customFavoriteConsultant.setConsultant(consultant);
- customFavoriteConsultant.setCustomId(user.getId());
- customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED);
+ boolean isConsultantInList = customFavoriteConsultantRepository.findOneByCustomIdAndConsultant(user.getId(), consultant).isPresent();
- customFavoriteConsultantRepository.save(customFavoriteConsultant);
+ if(!isConsultantInList) {
+ CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
+ customFavoriteConsultant.setConsultant(consultant);
+ customFavoriteConsultant.setCustomId(user.getId());
+ customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED);
+
+ customFavoriteConsultantRepository.save(customFavoriteConsultant);
+ }
+ else {
+ log.info("The consultant is in custom favorite list!");
+ }
});
}
--
Gitblit v1.8.0