From 68343c0e409d7f02f29c5a832a6a1e24e9690f06 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 01 三月 2022 15:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
PAMapp/pages/questionnaire/_agentNo.vue | 16 +++++++++-------
PAMapp/shared/const/quickFilter-questionList.ts | 12 ++++++------
pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java | 1 -
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/PAMapp/pages/questionnaire/_agentNo.vue b/PAMapp/pages/questionnaire/_agentNo.vue
index d81c21e..bf703e4 100644
--- a/PAMapp/pages/questionnaire/_agentNo.vue
+++ b/PAMapp/pages/questionnaire/_agentNo.vue
@@ -336,7 +336,6 @@
private setMyRequest(): void {
const storageMyRequest = getRequestsFromStorage();
const storageMyRequirement = this.recommendConsultantItem ? JSON.parse(this.recommendConsultantItem).requirements:[];
- const contactTypePromise = accountSettingService.getUserAccountSetting();
if (storageMyRequest) {
this.myRequest = {
@@ -358,12 +357,15 @@
removeRequestQuestionFromStorage();
}
- contactTypePromise.then((contactTypeDetail) => {
- this.myRequest = {
- ...this.myRequest,
- ...contactTypeDetail
- }
- })
+ if (authService.isUserLogin()) {
+ accountSettingService.getUserAccountSetting().then((contactTypeDetail) => {
+ this.myRequest = {
+ ...this.myRequest,
+ ...contactTypeDetail
+ }
+ })
+ }
+
}
diff --git a/PAMapp/shared/const/quickFilter-questionList.ts b/PAMapp/shared/const/quickFilter-questionList.ts
index 3539755..b00bd67 100644
--- a/PAMapp/shared/const/quickFilter-questionList.ts
+++ b/PAMapp/shared/const/quickFilter-questionList.ts
@@ -12,12 +12,12 @@
],
type: 'radio'
},
- {
- name: 'avgScore',
- title: '憿批�遛��漲',
- detail: [],
- type: ''
- },
+ // {
+ // name: 'avgScore',
+ // title: '憿批�遛��漲',
+ // detail: [],
+ // type: ''
+ // },
{
name: 'communicationStyles',
title: '皞�◢�',
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java b/pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java
index 2a466bb..be06791 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java
@@ -127,7 +127,6 @@
log.info("Sending appointment expiring notify to customer finish");
}
- // todo ��蝣箄�府����, otis todo=134497
@Scheduled(cron = "0 30 8 * * *")
public void sendNotFillAppointmentSatisfactionToPersonalNotification() {
Map<Long, List<Satisfaction>> customerNotFillSatisfactions =
--
Gitblit v1.8.0