From 5b6fa415a8433633864d5799484313040bef814a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 20 May 2021 17:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/Assessment.vue | 3 ++-
 src/components/page/Staff.vue      | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/page/Assessment.vue b/src/components/page/Assessment.vue
index e7ff7f9..516b73c 100644
--- a/src/components/page/Assessment.vue
+++ b/src/components/page/Assessment.vue
@@ -146,6 +146,7 @@ export default {
         return {
             name: sessionStorage.getItem('ms_username'),
             userId: this.$store.state.userLoginId,
+            roleId: this.$store.state.userRoleId.includes(',') ? 13 : Number(this.$store.state.userRoleId),
             systemList: [
                 {
                     id: 1,
@@ -300,7 +301,6 @@ export default {
     },
     methods: {
         getData() {
-            // return 
             let data = {
                 type: this.form.type,
                 startTime: this.form.startTime,
@@ -311,6 +311,7 @@ export default {
                 pageNum: this.pageNo,
                 pageSize: this.pageSize,
                 userId: this.userId,
+                role: this.roleId
             }
             this.$post(this.api.assessmentByScreen,data).then(res => {
                 this.customerData = res.list.list
diff --git a/src/components/page/Staff.vue b/src/components/page/Staff.vue
index 08c46db..13ae68b 100644
--- a/src/components/page/Staff.vue
+++ b/src/components/page/Staff.vue
@@ -363,8 +363,7 @@ export default {
         },
         getData(){
             let data = {
-                // staffProfessionalArchitectureIds: this.oneDepartmentIds,
-                staffProfessionalArchitectureIds: '',
+                staffProfessionalArchitectureIds: (this.oneDepartmentIds && this.twoDepartmentIds) ? '' : this.oneDepartmentIds,
                 staffGradeIds: this.twoDepartmentIds,
                 searchContent: this.encodeString(this.keyword),
                 page: this.pageNo,