From e94a6eeec259544f25ae7e9f6cbc86724bc38dd8 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Fri, 4 Dec 2020 16:01:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=91=98=E5=B7=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E9=99=84=E5=B8=A6=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=A0=E5=85=A5=E5=BC=B9=E5=87=BA=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/controller/FtStaffInfoDaoController.java     | 3 +--
 .../system/fantang/mapper/FtStaffInfoDaoMapper.java      | 2 +-
 ruoyi-ui/src/api/fantang/staffInfo.js                    | 7 +++++++
 ruoyi-ui/src/views/fantang/subsidy/index.vue             | 9 +++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
index 7fb2851c5..8065976ca 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtStaffInfoDaoController.java
@@ -59,8 +59,7 @@ public class FtStaffInfoDaoController extends BaseController {
 
     @GetMapping("/staffListWithDepart")
     public AjaxResult staffListWithDepart() {
-
-        return AjaxResult.success(null);
+        return AjaxResult.success(iFtStaffInfoDaoService.selectStaffInfoWithDepart());
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
index f9fb108cd..c14f2cb70 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java
@@ -14,6 +14,6 @@ import java.util.List;
  */
 public interface FtStaffInfoDaoMapper extends BaseMapper<FtStaffInfoDao> {
 
-    @Select("")
+    @Select("SELECT a.*, b.depart_name from ft_staff_info a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where staff_type = 1")
     List<FtStaffInfoDao> selectStaffInfoWithDepart();
 }
diff --git a/ruoyi-ui/src/api/fantang/staffInfo.js b/ruoyi-ui/src/api/fantang/staffInfo.js
index 3fb5e4839..b8c30e23e 100644
--- a/ruoyi-ui/src/api/fantang/staffInfo.js
+++ b/ruoyi-ui/src/api/fantang/staffInfo.js
@@ -9,6 +9,13 @@ export function listStaffInfo(query) {
   })
 }
 
+export function staffListWithDepart() {
+  return request({
+    url: '/fantang/staffInfo/staffListWithDepart',
+    method: 'get',
+  })
+}
+
 // 查询护工管理列表
 export function careStaffList(query) {
   return request({
diff --git a/ruoyi-ui/src/views/fantang/subsidy/index.vue b/ruoyi-ui/src/views/fantang/subsidy/index.vue
index 35b8f4247..9ad156ad6 100644
--- a/ruoyi-ui/src/views/fantang/subsidy/index.vue
+++ b/ruoyi-ui/src/views/fantang/subsidy/index.vue
@@ -143,7 +143,7 @@
     <el-dialog title="选择发放员工" :visible.sync="showPopupSubsidyGiveOut" width="500px" align="center">
       <el-table :data="staffData">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column property="departId" label="科室" width="200"></el-table-column>
+        <el-table-column property="departName" label="科室" width="200"></el-table-column>
         <el-table-column property="name" label="姓名" width="150"></el-table-column>
       </el-table>
       <br>
@@ -186,7 +186,7 @@
 
 <script>
 import {addSubsidy, delSubsidy, exportSubsidy, getSubsidy, listSubsidy, updateSubsidy} from "@/api/fantang/subsidy";
-import {listStaffInfo} from "@/api/fantang/staffInfo";
+import {staffListWithDepart} from "@/api/fantang/staffInfo";
 
 export default {
   name: "Subsidy",
@@ -251,8 +251,9 @@ export default {
 
     //  响应发放补贴按钮
     clickSubsidyGiveOut(row) {
-      listStaffInfo().then(response => {
-        this.staffData = response.rows;
+      staffListWithDepart().then(response => {
+        console.log(response);
+        this.staffData = response.data;
         this.showPopupSubsidyGiveOut = true;
       })