From fdbd0b594ca57eb3668f4425127f4dc16d3902f7 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 01 十二月 2021 10:27:41 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 8 ++++----
/dev/null | 7 -------
PAMapp/pages/accountSetting/index.vue | 14 ++++++--------
pamapi/src/main/java/com/pollex/pam/consts/SeniorityQueryConst.java | 9 +++++++++
pamapi/src/main/java/com/pollex/pam/service/dto/StrictQueryConsultantParam.java | 7 +++----
5 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/PAMapp/pages/accountSetting/index.vue b/PAMapp/pages/accountSetting/index.vue
index ff8eec9..fb21f19 100644
--- a/PAMapp/pages/accountSetting/index.vue
+++ b/PAMapp/pages/accountSetting/index.vue
@@ -23,7 +23,7 @@
</section>
- <section class="account-card" :class="{'edit': !userPhoneDisabled }">
+ <section class="account-card" :class="{'edit': !userPhoneDisabled }" v-if="phoneValue">
<div class="header">
<div class="block">
<div class="setting-title">蝬��</div>
@@ -44,15 +44,14 @@
</div>
</div>
</div>
-
- <i class="icon-edit icon"
+ <!-- <i class="icon-edit icon"
@click="editField('userPhone')"
- :class="{'icon-color-change': !userPhoneDisabled}"></i>
+ :class="{'icon-color-change': !userPhoneDisabled}"></i> -->
</div>
</section>
- <section class="account-card" :class="{'edit': !userEmailDisabled }">
+ <section class="account-card" :class="{'edit': !userEmailDisabled }" v-if="emailValue">
<div class="header">
<div class="block">
<div class="setting-title">蝬��</div>
@@ -73,8 +72,8 @@
</div>
</div>
- <i class="icon-edit icon" @click="editField('userEmail')"
- :class="{'icon-color-change': !userEmailDisabled}"></i>
+ <!-- <i class="icon-edit icon" @click="editField('userEmail')"
+ :class="{'icon-color-change': !userEmailDisabled}"></i> -->
</div>
</section>
@@ -249,7 +248,6 @@
.header{
display: flex;
align-items: baseline;
- justify-content: space-evenly;
}
.contact-input{
font-size: 20px;
diff --git a/pamapi/src/main/java/com/pollex/pam/consts/SeniorityQueryConst.java b/pamapi/src/main/java/com/pollex/pam/consts/SeniorityQueryConst.java
new file mode 100644
index 0000000..fc57ae7
--- /dev/null
+++ b/pamapi/src/main/java/com/pollex/pam/consts/SeniorityQueryConst.java
@@ -0,0 +1,9 @@
+package com.pollex.pam.consts;
+
+public class SeniorityQueryConst {
+ public static final String SENIOR = "SENIOR";
+ public static final String YOUNG = "YOUNG";
+ public static final String UNLIMITED = "UNLIMITED";
+
+ private SeniorityQueryConst() {}
+}
diff --git a/pamapi/src/main/java/com/pollex/pam/enums/SeniorityQueryEnum.java b/pamapi/src/main/java/com/pollex/pam/enums/SeniorityQueryEnum.java
deleted file mode 100644
index 8cf8576..0000000
--- a/pamapi/src/main/java/com/pollex/pam/enums/SeniorityQueryEnum.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.pollex.pam.enums;
-
-public enum SeniorityQueryEnum {
- SENIOR,
- YOUNG,
- UNLIMITED
-}
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 3163411..dda2ade 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -9,7 +9,7 @@
import javax.persistence.criteria.*;
import java.util.*;
-import static com.pollex.pam.enums.SeniorityQueryEnum.*;
+import static com.pollex.pam.consts.SeniorityQueryConst.*;
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
@@ -60,11 +60,11 @@
set.add(criteriaBuilder.greaterThanOrEqualTo(root.get("avgScore"), param.getAvgScore().intValue()));
}
- if(Objects.nonNull(param.getSeniority()) && param.getSeniority() != UNLIMITED) {
- if(param.getSeniority() == YOUNG) {
+ if(StringUtils.isNotEmpty(param.getSeniority()) && !StringUtils.equals(UNLIMITED, param.getSeniority())) {
+ if(YOUNG.equals(param.getSeniority())) {
set.add(criteriaBuilder.lessThanOrEqualTo(root.get("seniorityYear"), 5));
}
- else if(param.getSeniority() == SENIOR) {
+ else if(SENIOR.equals(param.getSeniority())) {
set.add(criteriaBuilder.greaterThan(root.get("seniorityYear"), 5));
}
}
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/StrictQueryConsultantParam.java b/pamapi/src/main/java/com/pollex/pam/service/dto/StrictQueryConsultantParam.java
index fc83599..a62c19d 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/StrictQueryConsultantParam.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/StrictQueryConsultantParam.java
@@ -1,7 +1,6 @@
package com.pollex.pam.service.dto;
import com.pollex.pam.enums.GenderEnum;
-import com.pollex.pam.enums.SeniorityQueryEnum;
import java.util.List;
@@ -13,7 +12,7 @@
private String area;
private List<String> requirements;
private String otherRequirement;
- private SeniorityQueryEnum seniority;
+ private String seniority;
private List<String> popularTags;
private String otherPopularTags;
@@ -65,11 +64,11 @@
this.otherRequirement = otherRequirement;
}
- public SeniorityQueryEnum getSeniority() {
+ public String getSeniority() {
return seniority;
}
- public void setSeniority(SeniorityQueryEnum seniority) {
+ public void setSeniority(String seniority) {
this.seniority = seniority;
}
--
Gitblit v1.8.0