隐患详情回显

danger-manage-admin/src/main/java/com/zehong/web/controller/safetyManagement/TStaffController.java

@@ -63,6 +63,13 @@ public class TStaffController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/allList")
+    public TableDataInfo allList(TStaffForm tStaff)
+    {
+        startPage();
+        List<TStaffVo> list = tStaffService.allList(tStaff);
+        return getDataTable(list);
+    }
     /**
      * 无分页查询
      * @param tStaff

danger-manage-system/src/main/java/com/zehong/system/mapper/TStaffMapper.java

@@ -35,6 +35,8 @@ public interface TStaffMapper
      * @return 员工信息管理集合
      */
     public List<TStaffVo> selectTStaffList(TStaffForm tStaff);
+    public List<TStaffVo> allList(TStaffForm tStaff);
+
 
     /**
      * 新增员工信息管理

danger-manage-system/src/main/java/com/zehong/system/service/ITStaffService.java

@@ -28,6 +28,8 @@ public interface ITStaffService
      * @return 员工信息管理集合
      */
     public List<TStaffVo> selectTStaffList(TStaffForm tStaff);
+    public List<TStaffVo> allList(TStaffForm tStaff);
+
 
     /**
      * 新增员工信息管理

danger-manage-system/src/main/java/com/zehong/system/service/impl/TStaffServiceImpl.java

@@ -55,6 +55,11 @@ public class TStaffServiceImpl implements ITStaffService
     {
         return tStaffMapper.selectTStaffList(tStaff);
     }
+    @Override
+    public List<TStaffVo> allList(TStaffForm tStaff)
+    {
+        return tStaffMapper.allList(tStaff);
+    }
 
     /**
      * 新增员工信息管理

danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml

@@ -65,7 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         group by t.user_id desc
     </select>
-
+    <select id="allList" parameterType="TStaffForm" resultMap="TStaffResult">
+        SELECT *,user_id as staff_id FROM sys_user  WHERE is_del = '0'
+    </select>
     <select id="selectTStaffById" parameterType="Long" resultMap="TStaffResult">
         <include refid="selectTStaffVo"/>
         where t.user_id = #{staffId}

danger-manage-web/src/api/safetyManagement/staff.js

@@ -9,7 +9,14 @@ export function listStaff(query) {
     params: query
   })
 }
-
+// 查询员工信息管理列表
+export function listAllStaff(query) {
+  return request({
+    url: '/safetyManagement/staff/allList',
+    method: 'get',
+    params: query
+  })
+}
 // 查询员工用户课程列表  无分页
 export function TStaffLisst(query) {
   return request({

danger-manage-web/src/views/system/book/index.vue

@@ -851,7 +851,7 @@
   import FileUpload from '@/components/FileUpload';
 import { listBook, getBook, delBook, addBook, updateBook, exportBook } from "@/api/system/book";
 import { listDept } from "@/api/system/dept";
-  import { listStaff } from "@/api/safetyManagement/staff";
+  import { listAllStaff } from "@/api/safetyManagement/staff";
   import { getUserProfile } from "@/api/system/user";
   let uploadfile = require("@/assets/uploadfile.png");
 export default {
@@ -992,7 +992,7 @@ export default {
     /** 查询员工列表 */
     getStaffList() {
       this.loading = true;
-      listStaff(this.queryParams2).then(response => {
+      listAllStaff(this.queryParams2).then(response => {
         this.staffList = response.rows;
         this.staffList2 = response.rows;
       this.loading = false;