From 1a8622c14a2b8686a5655523d22167354b3834cf Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 22 二月 2022 15:20:40 +0800
Subject: [PATCH] [update] 登入帳號狀態為停用時的文案
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
index f391f37..cc9d20d 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -1,6 +1,7 @@
package com.pollex.pam.service;
import com.pollex.pam.domain.Consultant;
+import com.pollex.pam.enums.ConsultantStatusEnum;
import com.pollex.pam.service.dto.FastQueryConsultantParam;
import com.pollex.pam.service.dto.StrictQueryConsultantParam;
import org.apache.commons.lang3.StringUtils;
@@ -23,6 +24,8 @@
@Override
public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
Set<Predicate> set = new HashSet<>();
+
+ set.add(criteriaBuilder.equal(root.get("status"), ConsultantStatusEnum.AVAILABLE));
param.getCommunicationStyles().forEach((communicationStyle) -> {
set.add(criteriaBuilder.like(root.get("communicationStyle"), "%" + communicationStyle + "%"));
@@ -61,6 +64,8 @@
public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
Set<Predicate> set = new HashSet<>();
+ set.add(criteriaBuilder.equal(root.get("status"), ConsultantStatusEnum.AVAILABLE));
+
if(Objects.nonNull(param.getGender())) {
set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
}
@@ -68,7 +73,7 @@
if(StringUtils.isNotEmpty(param.getArea())) {
set.add(criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%"));
}
-
+
Predicate[] predicates = new Predicate[set.size()];
predicates = set.toArray(predicates);
return criteriaBuilder.and(predicates);
--
Gitblit v1.8.0