From fbaed27c16c709cb3992e1545b81923dba02083a Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Sun, 18 Feb 2024 10:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/ehs/EhsRescueTeamWorkerController.java   | 6 +++---
 ruoyi-ui/src/api/ehs/realdata.js                            | 5 +++--
 ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue         | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java
index 6404fb2..2c7f6f8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java
@@ -87,10 +87,10 @@ public class EhsRescueTeamWorkerController extends BaseController {
     /**
      * 根据队伍id获取人员信息(分页)
      */
-    @GetMapping("/listWorker/{rescueTeamId}")
-    public TableDataInfo listWorker(@PathVariable("rescueTeamId") Long rescueTeamId) {
+    @GetMapping("/listWorker")
+    public TableDataInfo listWorker(EhsRescueTeamWorker ehsRescueTeamWorker) {
         startPage();
-        List<EhsRescueTeamWorker> list = ehsRescueTeamWorkerService.listWorker(rescueTeamId);
+        List<EhsRescueTeamWorker> list = ehsRescueTeamWorkerService.selectEhsRescueTeamWorkerList(ehsRescueTeamWorker);
         return getDataTable(list);
     }
 
diff --git a/ruoyi-ui/src/api/ehs/realdata.js b/ruoyi-ui/src/api/ehs/realdata.js
index e570824..a13ca43 100644
--- a/ruoyi-ui/src/api/ehs/realdata.js
+++ b/ruoyi-ui/src/api/ehs/realdata.js
@@ -10,9 +10,10 @@ export const getXq = (id) => {
 
 // 获取人员信息
 
-export const getWorkerInfo = (rescueTeamId) => {
+export const getWorkerInfo = (query) => {
   return request({
-    url: '/ehs/ehsRescueTeamWorker/listWorker/' + rescueTeamId,
+    url: '/ehs/ehsRescueTeamWorker/listWorker',
     method: 'get',
+    params: query
   })
 }
diff --git a/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue b/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue
index d9bdcbd..d2a6a29 100644
--- a/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue
+++ b/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue
@@ -145,7 +145,7 @@ export default {
   methods:{
     async getList() {
       this.loading = true;
-      await getWorkerInfo(this.readParams.rescueTeamId).then(res => {
+      await getWorkerInfo({"pageNum" : this.pageNum, "pageSize" : this.pageSize, "rescueTeamId" : this.readParams.rescueTeamId}).then(res => {
         this.total = res.total;
         this.workerList = res.rows;
         this.loading = false;