2022.9.2 报表导出bug

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -899,15 +899,12 @@ export default {
 
 
     getUserList() {
-      this.http.post('/user/getEmployeeList', {
-        departmentId: -1,
-        pageIndex: 1,
-        // pageSize: 99999
-        pageSize: -1
+      this.http.post('/user/getUserListByRole', {
+        
       },
       res => {
           if (res.code == "ok") {
-              this.userList = res.data.records;
+              this.userList = res.data;
               this.selUserList = this.userList
           } else {
               this.$message({
@@ -1150,7 +1147,7 @@ export default {
           url += "/exportWaitingReviewList"
           sl.startDate = this.rangeDatas[0]
           sl.endDate = this.rangeDatas[1]
-          sl.stateKey = this.departmentOrProject
+          sl.stateKey = this.stateKey
           if(this.userId){
             sl.userId = this.userId
           }

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -3090,7 +3090,7 @@ a {
                 //     // pageSize: 99999
                 //     pageSize: -1
                 // },
-                this.http.post('/user/getSimpleActiveUserList', {},
+                this.http.post('/user/getUserListByRole', {},
                 res => {
                     if (res.code == "ok") {
                         this.users = res.data;