From 21baf76da2522b750ec9855b45f37eda88de768b Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Fri, 15 Dec 2023 14:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=95=91=E6=8F=B4=E9=98=9F?=
 =?UTF-8?q?=E4=BC=8D=E7=AE=A1=E7=90=86,=E8=A1=8C=E6=94=BF=E5=85=AC?=
 =?UTF-8?q?=E6=96=87=E5=8F=B0=E8=B4=A6,=E5=85=AC=E6=96=87=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E4=B8=89=E4=B8=AA=E6=A8=A1=E5=9D=97=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EhsDocumentServiceImpl.java  |  9 +++-
 .../impl/EhsFloodDroughtTeamServiceImpl.java  | 11 ++++-
 .../impl/EhsRescueTeamServiceImpl.java        | 10 +++++
 .../mapper/ehs/EhsRescueTeamMapper.xml        | 33 +++++++-------
 .../views/ehs/ehsFloodDroughtTeam/index.vue   | 42 ++++++++++++++---
 .../src/views/ehs/ehsRescueTeam/index.vue     | 45 ++++++++++++++++---
 6 files changed, 118 insertions(+), 32 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsDocument/service/impl/EhsDocumentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsDocument/service/impl/EhsDocumentServiceImpl.java
index dba040a..70e8d60 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsDocument/service/impl/EhsDocumentServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsDocument/service/impl/EhsDocumentServiceImpl.java
@@ -48,6 +48,13 @@ public class EhsDocumentServiceImpl extends ServiceImpl<EhsDocumentMapper, EhsDo
      * @return 公文管理
      */
     @Override
+    public List<EhsDocument> selectEhsDocumentList(EhsDocument ehsDocument) {
+        // 按部门区分权限,局端没有查询全部的权限
+        SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+        ehsDocument.setDeptId(currentUser.getDept().getDeptId().longValue());
+        return ehsDocumentMapper.selectEhsDocumentList(ehsDocument);
+    }
+    /*@Override
     public List<EhsDocument> selectEhsDocumentList(EhsDocument ehsDocument) {
         // 如果登录用户不是县级部门(即不是根节点parent_id=0),那么只能查询本部门的;县级部门(根节点)则查询全部
         SysUser currentUser = SecurityUtils.getLoginUser().getUser();
@@ -57,7 +64,7 @@ public class EhsDocumentServiceImpl extends ServiceImpl<EhsDocumentMapper, EhsDo
             ehsDocument.setDeptId(currentUser.getDept().getDeptId().longValue());
         }
         return ehsDocumentMapper.selectEhsDocumentList(ehsDocument);
-    }
+    }*/
 
     /**
      * 获取拟稿部门下拉列表
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/service/impl/EhsFloodDroughtTeamServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/service/impl/EhsFloodDroughtTeamServiceImpl.java
index 28db16b..c30b35d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/service/impl/EhsFloodDroughtTeamServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsFloodDroughtTeam/service/impl/EhsFloodDroughtTeamServiceImpl.java
@@ -3,6 +3,8 @@ package com.ruoyi.ehsFloodDroughtTeam.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.ehsFloodDroughtTeam.domain.FloodDroughtTeamImportTemplate;
 import com.ruoyi.ehsFloodDroughtTeam.vo.FloodDroughtTeamVo;
 import org.springframework.stereotype.Service;
@@ -47,10 +49,17 @@ public class EhsFloodDroughtTeamServiceImpl extends ServiceImpl<EhsFloodDroughtT
      */
     @Override
     public List<EhsFloodDroughtTeam> selectEhsFloodDroughtTeamList(EhsFloodDroughtTeam ehsFloodDroughtTeam) {
+        // 如果不是局端,那么只能查询自己部门下的数据
+        SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+        Long deptParentId = currentUser.getDept().getParentId();
+        if (deptParentId != null && deptParentId.longValue() != 0) {
+            ehsFloodDroughtTeam.setDeptId(currentUser.getDept().getDeptId().longValue());
+        }
         List<EhsFloodDroughtTeam> teamList = ehsFloodDroughtTeamMapper.selectEhsFloodDroughtTeamList(ehsFloodDroughtTeam);
+        // 给队伍设置人数信息
         teamList.stream().forEach(item -> {
             Long count = ehsFloodDroughtTeamMapper.getWorkerNumByTeamId(item.getId());
-            if (count != null){
+            if (count != null) {
                 item.setRescueWorkerNum(count);
             }
         });
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/service/impl/EhsRescueTeamServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/service/impl/EhsRescueTeamServiceImpl.java
index ddfd584..193c942 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/service/impl/EhsRescueTeamServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsRescueTeam/service/impl/EhsRescueTeamServiceImpl.java
@@ -3,6 +3,8 @@ package com.ruoyi.ehsRescueTeam.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.ehsRescueTeam.domain.EhsRescueTeam;
 import com.ruoyi.ehsRescueTeam.domain.RescueTeamImportTemplate;
@@ -47,7 +49,15 @@ public class EhsRescueTeamServiceImpl extends ServiceImpl<EhsRescueTeamMapper, E
      */
     @Override
     public List<EhsRescueTeam> selectEhsRescueTeamList(EhsRescueTeam ehsRescueTeam) {
+        // 如果不是局端,那么只能查询自己部门下的数据
+        SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+        Long deptParentId = currentUser.getDept().getParentId();
+        if (deptParentId != null &&
+                deptParentId.longValue() != 0) {
+            ehsRescueTeam.setDeptId(currentUser.getDept().getDeptId().longValue());
+        }
         List<EhsRescueTeam> ehsRescueTeamList = ehsRescueTeamMapper.selectEhsRescueTeamList(ehsRescueTeam);
+        // 给队伍设置人数信息
         ehsRescueTeamList.stream().forEach(item->{
             Long count = ehsRescueTeamMapper.getWorkerNumByTeamId(item.getId());
             if (count != null){
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamMapper.xml
index ac1570a..5ccb208 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsRescueTeamMapper.xml
@@ -5,18 +5,18 @@
 <mapper namespace="com.ruoyi.ehsRescueTeam.mapper.EhsRescueTeamMapper">
 
     <resultMap type="EhsRescueTeam" id="EhsRescueTeamResult">
-            <result property="id"    column="id"    />
-            <result property="teamName"    column="team_name"    />
-            <result property="teamLevel"    column="team_level"    />
-            <!--<result property="rescueWorkerNum"    column="rescue_worker_num"    />-->
-            <result property="createBy"    column="create_by"    />
-            <result property="createTime"    column="create_time"    />
-            <result property="updateBy"    column="update_by"    />
-            <result property="updateTime"    column="update_time"    />
-            <result property="remark"    column="remark"    />
-            <result property="deptId"    column="dept_id"    />
-            <result property="createUserId"    column="create_user_id"    />
-            <result property="updateUserId"    column="update_user_id"    />
+        <result property="id" column="id"/>
+        <result property="teamName" column="team_name"/>
+        <result property="teamLevel" column="team_level"/>
+        <!--<result property="rescueWorkerNum"    column="rescue_worker_num"    />-->
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="createUserId" column="create_user_id"/>
+        <result property="updateUserId" column="update_user_id"/>
     </resultMap>
 
     <sql id="selectEhsRescueTeamVo">
@@ -26,14 +26,15 @@
     <select id="selectEhsRescueTeamList" parameterType="EhsRescueTeam" resultMap="EhsRescueTeamResult">
         <include refid="selectEhsRescueTeamVo"/>
         <where>
-                        <if test="teamName != null  and teamName != ''"> and team_name like concat('%', #{teamName}, '%')</if>
-                        <if test="teamLevel != null  and teamLevel != ''"> and team_level like concat('%', #{teamLevel}, '%')</if>
+            <if test="teamName != null  and teamName != ''">and team_name like concat('%', #{teamName}, '%')</if>
+            <if test="teamLevel != null  and teamLevel != ''">and team_level like concat('%', #{teamLevel}, '%')</if>
+            <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
         </where>
     </select>
 
     <select id="selectEhsRescueTeamById" parameterType="Long" resultMap="EhsRescueTeamResult">
-            <include refid="selectEhsRescueTeamVo"/>
-            where id = #{id}
+        <include refid="selectEhsRescueTeamVo"/>
+        where id = #{id}
     </select>
     <select id="getWorkerNumByTeamId" resultType="java.lang.Long">
         SELECT IFNULL(
diff --git a/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue b/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue
index 6035f37..51b4337 100644
--- a/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue
@@ -1,6 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="创建者部门" prop="deptId" v-show="deptShow">
+        <el-select v-model="queryParams.deptId" filterable placeholder="请选择部门" clearable>
+          <el-option
+            v-for="dict in allDeptList"
+            :key="dict.deptId"
+            :label="dict.deptName"
+            :value="dict.deptId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="队伍名称" prop="teamName">
         <el-input
           v-model="queryParams.teamName"
@@ -34,7 +44,7 @@
           v-hasPermi="['ehs:ehsFloodDroughtTeam:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -44,8 +54,8 @@
           @click="handleUpdate"
           v-hasPermi="['ehs:ehsFloodDroughtTeam:edit']"
         >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      </el-col>-->
+<!--      <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -55,7 +65,7 @@
           @click="handleDelete"
           v-hasPermi="['ehs:ehsFloodDroughtTeam:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -91,8 +101,8 @@
       <el-table-column label="救援人员数量" align="center" prop="rescueWorkerNum" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-<!--          <el-button
+        <template slot-scope="scope" v-if="curDeptId == scope.row.deptId">
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -105,7 +115,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['ehs:ehsFloodDroughtTeam:remove']"
-          >删除</el-button>-->
+          >删除</el-button>
           <el-button
             size="mini"
             type="text"
@@ -165,6 +175,7 @@
 import { listEhsFloodDroughtTeam, getEhsFloodDroughtTeam, delEhsFloodDroughtTeam, addEhsFloodDroughtTeam, updateEhsFloodDroughtTeam } from "@/api/ehs/ehsFloodDroughtTeam";
 import importUpload from "@/components/upload/upload";
 import tdh from "../ehsFloodDroughtWorker/index.vue";
+import {listAllDept } from "@/api/system/dept";
 export default {
   name: "EhsFloodDroughtTeam",
   components: {
@@ -183,6 +194,11 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      //是否显示部门列表查询条件
+      deptShow: false,
+      curDeptId:-1,//当前部门
+      //所有部门列表字典
+      allDeptList: [],
       // 总条数
       total: 0,
       // 防汛抗旱队伍管理表格数据
@@ -211,6 +227,9 @@ export default {
   },
   created() {
     this.getList();
+    this.getListAllDept();
+    this.deptShow = this.$store.state.user.parentId==0 ?true :false;
+    this.curDeptId = this.$store.state.user.deptId;
   },
   methods: {
     flood(){
@@ -225,6 +244,15 @@ export default {
         this.loading = false;
       });
     },
+    /** 单位信息列表 */
+    getListAllDept() {
+      console.log(this.$store.state.user.deptId);
+      this.loading = true;
+      listAllDept().then(response => {
+        this.allDeptList = response.data;
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
diff --git a/ruoyi-ui/src/views/ehs/ehsRescueTeam/index.vue b/ruoyi-ui/src/views/ehs/ehsRescueTeam/index.vue
index fd4a1ec..0f1f74c 100644
--- a/ruoyi-ui/src/views/ehs/ehsRescueTeam/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsRescueTeam/index.vue
@@ -1,6 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="创建者部门" prop="deptId" v-show="deptShow">
+        <el-select v-model="queryParams.deptId" filterable placeholder="请选择部门" clearable>
+          <el-option
+            v-for="dict in allDeptList"
+            :key="dict.deptId"
+            :label="dict.deptName"
+            :value="dict.deptId"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="队伍名称" prop="teamName">
         <el-input
           v-model="queryParams.teamName"
@@ -34,7 +45,7 @@
           v-hasPermi="['ehs:ehsRescueTeam:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -44,8 +55,8 @@
           @click="handleUpdate"
           v-hasPermi="['ehs:ehsRescueTeam:edit']"
         >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      </el-col>-->
+<!--      <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -55,7 +66,7 @@
           @click="handleDelete"
           v-hasPermi="['ehs:ehsRescueTeam:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -92,14 +103,15 @@
       <el-table-column label="救援人员数量" align="center" prop="rescueWorkerNum" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+
+        <template slot-scope="scope" v-if="curDeptId == scope.row.deptId">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="getWorker(scope.row)"
           >人员信息</el-button>
-<!--          <el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -112,7 +124,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['ehs:ehsRescueTeam:remove']"
-          >删除</el-button>-->
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -168,6 +180,7 @@ import { listEhsRescueTeam, getEhsRescueTeam, delEhsRescueTeam, addEhsRescueTeam
 import { listEhsRescueTeamWorker, getEhsRescueTeamWorker, delEhsRescueTeamWorker, addEhsRescueTeamWorker, updateEhsRescueTeamWorker } from "@/api/ehs/ehsRescueTeamWorker";
 import importUpload from "@/components/upload/upload";
 import tdh from "../ehsRescueTeamWorker/index.vue"
+import {listAllDept } from "@/api/system/dept";
 export default {
   name: "EhsRescueTeam",
   components: {
@@ -186,10 +199,15 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      curDeptId:-1,//当前部门
       // 总条数
       total: 0,
       // 应急救援队伍管理表格数据
       ehsRescueTeamList: [],
+      //是否显示部门列表查询条件
+      deptShow: false,
+      //所有部门列表字典
+      allDeptList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -203,6 +221,7 @@ export default {
         pageSize: 10,
         teamName: null,
         teamLevel: null,
+        deptId: null,
       },
       // 表单参数
       form: {},
@@ -213,6 +232,9 @@ export default {
   },
   created() {
     this.getList();
+    this.getListAllDept();
+    this.deptShow = this.$store.state.user.parentId==0 ?true :false;
+    this.curDeptId = this.$store.state.user.deptId;
   },
   methods: {
     rescue() {
@@ -227,6 +249,15 @@ export default {
         this.loading = false;
       });
     },
+    /** 单位信息列表 */
+    getListAllDept() {
+      console.log(this.$store.state.user.deptId);
+      this.loading = true;
+      listAllDept().then(response => {
+        this.allDeptList = response.data;
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;