环保人员可视化监控\污染源管理\重点企业管理\污染源监测点管理\环保人员管理\污染口管理\水质断面监测\秸秆离田管理\应急物资管理\应急队伍管理\仓库信息管理\危化企业管理

data-ui/src/views/data/digitalagriculture/farmland/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="地块名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -19,6 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -260,7 +269,7 @@
                     updateDate: null,
                     remarks: null,
                     deptId: null,
-                    deptName: null
+                    deptName: 0
                 },
                 // 表单参数
                 form: {},
@@ -388,11 +397,16 @@
                 this.queryParams.pageNum = 1;
                 this.getList();
             },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.resetForm("queryForm");
-                this.handleQuery();
-            },
+          /** 重置按钮操作 */
+          resetQuery() {
+            this.queryParams.deptName = 0;
+            this.resetForm("queryForm");
+            this.handleQuery();
+          },
+          // 点击按钮修改是否只查询本级部门用户
+          changeQueryType() {
+            this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+          },
             // 多选框选中数据
             handleSelectionChange(selection) {
                 this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalemergency/enterprises/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="true" label-width="90px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="true"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -9,6 +9,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -279,7 +288,8 @@
           remark: null,
           phone: null,
           contacts: null,
-
+          deptId: null,
+          deptName: 0,
         },
         // 表单参数
         form: {},
@@ -411,9 +421,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalemergency/material/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <!--      <el-form-item label="删除人" prop="deleteBy">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.deleteBy"-->
@@ -125,6 +125,15 @@
       <!--          @keyup.enter.native="handleQuery"-->
       <!--        />-->
       <!--      </el-form-item>-->
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -376,6 +385,8 @@
           createTime:null,
           updateName:null,
           updateTime:null,
+          deptId: null,
+          deptName: 0,
         },
         // 表单参数
         form: {},
@@ -484,9 +495,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalemergency/team/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -9,6 +9,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -269,7 +278,7 @@ export default {
         dataStatus: null,
         name: null,
         deptId: null,
-        deptName: null,
+        deptName: 0,
         teamType: null,
         teamNature: null,
         expertiseAreas: null,
@@ -435,9 +444,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalemergency/warehouse/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -9,6 +9,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -233,7 +242,7 @@ export default {
         dataStatus: null,
         name: null,
         deptId: null,
-        deptName: null,
+        deptName: 0,
         longitude: null,
         latitude: null,
         createName:null,
@@ -359,9 +368,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalenvironment/LeaveField/index.vue

@@ -28,7 +28,7 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="['2'].includes(routeParams.leaveFieldType)?20:24" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" @submit.native.prevent>
           <el-form-item label="标题" prop="leaveName">
             <el-input
               v-model="queryParams.leaveName"
@@ -47,7 +47,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="所属县（市）区" prop="district" v-if="['3'].includes(routeParams.leaveFieldType)" label-width="120px">
+          <el-form-item label="所属县（市）区" prop="district" v-if="['3'].includes(routeParams.leaveFieldType)" >
             <el-input
               v-model="queryParams.district"
               placeholder="请输入所属县（市）区"
@@ -56,7 +56,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="所属乡镇（街）" prop="village" v-if="['3'].includes(routeParams.leaveFieldType)" label-width="120px">
+          <el-form-item label="所属乡镇（街）" prop="village" v-if="['3'].includes(routeParams.leaveFieldType)" >
             <el-input
               v-model="queryParams.village"
               placeholder="请输入所属乡镇（街）"
@@ -83,7 +83,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="离田开始时间" prop="startLeaveTime"v-if="['2','3'].includes(routeParams.leaveFieldType)" label-width="120px">
+          <el-form-item label="离田开始时间" prop="startLeaveTime"v-if="['2','3'].includes(routeParams.leaveFieldType)" >
             <el-date-picker clearable
                             @change="startLeaveTimeChange"
                             v-model="queryParams.startLeaveTime"
@@ -92,7 +92,7 @@
                             placeholder="请选择离田开始时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="离田结束时间" prop="endLeaveTime"v-if="['2','3'].includes(routeParams.leaveFieldType)" label-width="120px">
+          <el-form-item label="离田结束时间" prop="endLeaveTime"v-if="['2','3'].includes(routeParams.leaveFieldType)" >
             <el-date-picker clearable
                             @change="endLeaveTimeChange"
                             v-model="queryParams.endLeaveTime"
@@ -101,6 +101,15 @@
                             placeholder="请选择离田结束时间">
             </el-date-picker>
           </el-form-item>
+          <el-form-item prop="deptId" v-if="['1','3'].includes(routeParams.leaveFieldType)">
+            <template slot="label">
+              <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+              <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+            </template>
+            <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                        placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+            <el-input v-model="queryParams.deptName" v-if="false"/>
+          </el-form-item>
           <!--<el-form-item label="补助金额" prop="subsidyMoney" v-if="['3'].includes(routeParams.leaveFieldType)">-->
           <!--<el-input-->
           <!--v-model="queryParams.subsidyMoney"-->
@@ -511,7 +520,7 @@
           updateDate: null,
           remarks: null,
           deptId: null,
-          deptName: null,
+          deptName: 0,
           leaveFieldType: null,
         },
         // 表单参数
@@ -646,9 +655,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalenvironment/biggas/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" @submit.native.prevent>
       <el-form-item label="名称" prop="gasName">
         <el-input
           v-model="queryParams.gasName"
@@ -19,6 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -193,7 +202,7 @@
           gasName: null,
           address: null,
           deptId: null,
-          deptName: null,
+          deptName: 0,
           createName: null,
           updateName: null,
           userId: null,
@@ -312,9 +321,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalenvironment/keyenterprise/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -28,14 +28,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="地址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -280,6 +280,8 @@
           name: null,
           address: null,
           legalPerson: null,
+          deptId: null,
+          deptName: 0,
           code: null,
         },
         // 表单参数
@@ -409,9 +411,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalenvironment/monitor/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -286,7 +295,7 @@
           pageNum: 1,
           pageSize: 10,
           deptId: null,
-          deptName: null,
+          deptName: 0,
           longitude: null,
           latitude: null,
           district: null,
@@ -421,9 +430,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalenvironment/person/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" @submit.native.prevent>
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"
+                    style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -127,14 +137,15 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-<!--            <el-form-item label="姓名" prop="name">
-              <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" disabled/>
-            </el-form-item>-->
+            <!--            <el-form-item label="姓名" prop="name">
+                          <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" disabled/>
+                        </el-form-item>-->
             <el-form-item label="行政职务" prop="position">
               <el-input v-model="form.position" placeholder="请输入行政职务" maxlength="20"/>
             </el-form-item>
             <el-form-item label="所属部门" prop="deptId" class="form-style">
-              <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true" :noResultsText="'空'" :noOptionsText="'空'"
+              <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true"
+                          :noResultsText="'空'" :noOptionsText="'空'"
                           placeholder="请选择部门" @select="hx"/>
             </el-form-item>
           </el-col>
@@ -156,7 +167,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话"  disabled maxlength="20"/>
+              <el-input v-model="form.phone" placeholder="请输入联系电话" disabled maxlength="20"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -193,240 +204,246 @@
 </template>
 
 <script>
-    import {listPerson, getPerson, delPerson, addPerson, updatePerson} from "@/api/data/digitalenvironment/person";
-    import Deptselector from '@/views/components/deptselector';
-    import {
-        selectUserList
-    } from "@/api/data/digitalforest/linleader/linleader";
-    import {treeselect} from "@/api/system/dept";
-    import Treeselect from "@riophae/vue-treeselect";
-    import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-    export default {
-        dicts: ['centerdata_hydroenergy_plan_rank', 'centerdata_environment_job','sys_user_sex'],
-        components: {
-            Deptselector,
-          Treeselect
-        },
-        setDataDeptId(e) {
-            this.form.deptId = e.deptId;
-            this.form.deptName = e.deptName;
-        },
-        name: "Person",
-        data() {
-            return {
-                disabled:false,
-                userList: [],
-              deptOptions: undefined,
-                // 遮罩层
-                loading: true,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 资源人员表格数据
-                personList: [],
-                // 弹出层标题
-                title: "",
-                // 是否显示弹出层
-                open: false,
-                // 查询参数
-                queryParams: {
-                    pageNum: 1,
-                    pageSize: 10,
-                    name: null,
-                    sex: null,
-                    phone: null,
-                    attachId: null,
-                    post: null,
-                    position: null,
-                    introduction: null,
-                    riverwayLengthCounty: null,
-                    deptId: null,
-                    deptName: null,
-                    createName: null,
-                    updateName: null,
-                    dataStatus: null,
-                    userId: null
-                },
-                // 表单参数
-                form: {
-                    dialogImageUrl: '',
-                    imageUrl: ''
-                },
-                // 表单校验
-                rules: {
-                    sex: [
-                        {required: true, message: "性别不能为空", trigger: "change"}
-                    ],
-                    deptId: [
-                        {required: true, message: "所属部门不能为空", trigger: "change"}
-                    ],
-                    name: [
-                        {required: true, message: "姓名不能为空", trigger: "change"}
-                    ],
-                    post: [
-                        {required: true, message: "岗位不能为空", trigger: "change"}
-                    ],
-                    userId: [
-                        {required: true, message: "关联用户不能为空", trigger: "change"}
-                    ],
-                    environmentJob: [
-                        {required: true, message: "职务不能为空", trigger: "change"}
-                    ]
-                }
-            };
-        },
-        created() {
-            this.getList();
-          this.getTreeselect();
+import {listPerson, getPerson, delPerson, addPerson, updatePerson} from "@/api/data/digitalenvironment/person";
+import Deptselector from '@/views/components/deptselector';
+import {
+  selectUserList
+} from "@/api/data/digitalforest/linleader/linleader";
+import {treeselect} from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-          selectUserList().then(response => {
-                this.userList = response.data;
-            });
-        },
-        methods: {
-          getTreeselect() {
-            treeselect().then(response => {
-              this.deptOptions = response.data
-            })
-          },
-          hx(node) {
-            this.form.dataDeptId = node.id
-            this.form.deptId = node.id
-            this.form.deptName = node.label
-            this.$refs.form.validateField("deptId")
-          },
-            a(event) {
-                this.form.name = event.nickName
-                this.form.sex = event.sex
-                this.form.phone = event.phonenumber
-            },
-            getUrl(url) {
-                this.form.dialogImageUrl = url;
-                this.form.attachId = url;
-            },
-            setDataDeptId(e) {
-                this.form.deptId = e.deptId;
-                this.form.deptName = e.deptName;
-            },
-            /** 查询环保人员列表 */
-            getList() {
-                this.loading = true;
-                listPerson(this.queryParams).then(response => {
-                    this.personList = response.rows;
-                    this.total = response.total;
-                    this.loading = false;
-                });
-            },
-            // 取消按钮
-            cancel() {
-                this.open = false;
-                this.reset();
-            },
-            // 表单重置
-            reset() {
-                this.form = {
-                    id: null,
-                    name: null,
-                    sex: null,
-                    phone: null,
-                    attachId: null,
-                    post: null,
-                    position: null,
-                    introduction: null,
-                    riverwayLengthCounty: null,
-                    deptId: null,
-                    deptName: null,
-                    createBy: null,
-                    createName: null,
-                    createTime: null,
-                    updateBy: null,
-                    updateName: null,
-                    updateTime: null,
-                    dataStatus: "0",
-                    userId: null
-                };
-                this.resetForm("form");
-            },
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNum = 1;
-                this.getList();
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.resetForm("queryForm");
-                this.handleQuery();
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map(item => item.id)
-                this.single = selection.length !== 1
-                this.multiple = !selection.length
-            },
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset();
-                this.open = true;
-                this.title = "添加环保人员";
-                this.disabled=false;
+export default {
+  dicts: ['centerdata_hydroenergy_plan_rank', 'centerdata_environment_job', 'sys_user_sex'],
+  components: {
+    Deptselector,
+    Treeselect
+  },
+  setDataDeptId(e) {
+    this.form.deptId = e.deptId;
+    this.form.deptName = e.deptName;
+  },
+  name: "Person",
+  data() {
+    return {
+      disabled: false,
+      userList: [],
+      deptOptions: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 资源人员表格数据
+      personList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        sex: null,
+        phone: null,
+        attachId: null,
+        post: null,
+        position: null,
+        introduction: null,
+        riverwayLengthCounty: null,
+        deptId: null,
+        deptName: 0,
+        createName: null,
+        updateName: null,
+        dataStatus: null,
+        userId: null
+      },
+      // 表单参数
+      form: {
+        dialogImageUrl: '',
+        imageUrl: ''
+      },
+      // 表单校验
+      rules: {
+        sex: [
+          {required: true, message: "性别不能为空", trigger: "change"}
+        ],
+        deptId: [
+          {required: true, message: "所属部门不能为空", trigger: "change"}
+        ],
+        name: [
+          {required: true, message: "姓名不能为空", trigger: "change"}
+        ],
+        post: [
+          {required: true, message: "岗位不能为空", trigger: "change"}
+        ],
+        userId: [
+          {required: true, message: "关联用户不能为空", trigger: "change"}
+        ],
+        environmentJob: [
+          {required: true, message: "职务不能为空", trigger: "change"}
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
 
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                this.reset();
-                const id = row.id || this.ids
-                this.disabled=true;
-                getPerson(id).then(response => {
-                    this.form = response.data;
-                    this.open = true;
-                    this.title = "修改环保人员";
+    selectUserList().then(response => {
+      this.userList = response.data;
+    });
+  },
+  methods: {
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data
+      })
+    },
+    hx(node) {
+      this.form.dataDeptId = node.id
+      this.form.deptId = node.id
+      this.form.deptName = node.label
+      this.$refs.form.validateField("deptId")
+    },
+    a(event) {
+      this.form.name = event.nickName
+      this.form.sex = event.sex
+      this.form.phone = event.phonenumber
+    },
+    getUrl(url) {
+      this.form.dialogImageUrl = url;
+      this.form.attachId = url;
+    },
+    setDataDeptId(e) {
+      this.form.deptId = e.deptId;
+      this.form.deptName = e.deptName;
+    },
+    /** 查询环保人员列表 */
+    getList() {
+      this.loading = true;
+      listPerson(this.queryParams).then(response => {
+        this.personList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        sex: null,
+        phone: null,
+        attachId: null,
+        post: null,
+        position: null,
+        introduction: null,
+        riverwayLengthCounty: null,
+        deptId: null,
+        deptName: null,
+        createBy: null,
+        createName: null,
+        createTime: null,
+        updateBy: null,
+        updateName: null,
+        updateTime: null,
+        dataStatus: "0",
+        userId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.deptName = 0;
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加环保人员";
+      this.disabled = false;
 
-                });
-            },
-            /** 提交按钮 */
-            submitForm() {
-                this.$refs["form"].validate(valid => {
-                    if (valid) {
-                        if (this.form.id != null) {
-                            updatePerson(this.form).then(response => {
-                                this.$modal.msgSuccess("修改成功");
-                                this.open = false;
-                                this.getList();
-                            });
-                        } else {
-                            addPerson(this.form).then(response => {
-                                this.$modal.msgSuccess("新增成功");
-                                this.open = false;
-                                this.getList();
-                            });
-                        }
-                    }
-                });
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                const ids = row.id || this.ids;
-                this.$modal.confirm('是否确认删除选中的数据项？').then(function () {
-                    return delPerson(ids);
-                }).then(() => {
-                    this.getList();
-                    this.$modal.msgSuccess("删除成功");
-                }).catch(() => {
-                });
-            },
-            /** 导出按钮操作 */
-            handleExport() {
-                this.download('/center-data/environmentPerson/export', {
-                    ...this.queryParams
-                }, `环保人员_${new Date().getTime()}.xlsx`)
-            }
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      this.disabled = true;
+      getPerson(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改环保人员";
+
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePerson(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPerson(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
         }
-    };
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除选中的数据项？').then(function () {
+        return delPerson(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('/center-data/environmentPerson/export', {
+        ...this.queryParams
+      }, `环保人员_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
 </script>

data-ui/src/views/data/digitalenvironment/sewageoutlet/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -295,7 +304,8 @@ export default {
         name: null,
         sewageOneClassification: null,
         sewageTwoClassification: null,
-        deptName: null,
+        deptId: null,
+        deptName: 0,
         notes: null,
         type: null,
       },
@@ -427,9 +437,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalenvironment/sourcepollution/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -29,6 +29,15 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -239,6 +248,8 @@
           name: null,
           address: null,
           type: null,
+          deptId: null,
+          deptName: 0,
         },
         // 表单参数
         form: {},
@@ -354,9 +365,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalfirecontrol/basiclinkageforce/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"  @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"   @submit.native.prevent>
       <el-form-item label="所属机构" prop="institutionName">
         <el-input
           v-model="queryParams.institutionName"
@@ -64,6 +64,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -310,7 +319,7 @@ export default {
         fireFightingTruckNum: null,
         fireFightingTruckTonnage: null,
         deptId: null,
-        deptName: null,
+        deptName: 0,
         phone:null,
         contacts:null,
         createName:null,
@@ -454,9 +463,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalfirecontrol/fireforce/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"  @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -73,6 +73,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -324,7 +333,7 @@ export default {
         longitude: null,
         latitude: null,
         deptId: null,
-        deptName: null,
+        deptName: 0,
         createName:null,
         createTime:null,
         updateName:null,
@@ -471,9 +480,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalfirecontrol/foamliquid/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="company">
         <el-input
           v-model="queryParams.company"
@@ -19,6 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -262,6 +271,8 @@ export default {
         createTime:null,
         updateName:null,
         updateTime:null,
+        deptId: null,
+        deptName: 0,
       },
       // 表单参数
       form: {},
@@ -390,9 +401,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalfirecontrol/fulltimestation/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"  @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -28,6 +28,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -263,6 +272,8 @@ export default {
         createTime:null,
         updateName:null,
         updateTime:null,
+        deptId: null,
+        deptName: 0,
       },
       // 表单参数
       form: {},
@@ -382,9 +393,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     getCenterMonitorlList() {
       selectCenterMonitorlList({pageNum: 1, pageSize: 10}).then(response => {
         this.deviceList = response.data;

data-ui/src/views/data/digitalfirecontrol/keyplaces/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"  @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -248,7 +257,7 @@ export default {
         longitude: null,
         latitude: null,
         deptId: null,
-        deptName: null,
+        deptName: 0,
         createName:null,
         createTime:null,
         updateName:null,
@@ -389,9 +398,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalfirecontrol/otherlinkageforce/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="company">
         <el-input
           v-model="queryParams.company"
@@ -55,6 +55,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -293,11 +302,12 @@ export default {
         longitude: null,
         latitude: null,
         deptId: null,
-        deptName: null,
+        deptName: 0,
         createName:null,
         createTime:null,
         updateName:null,
         updateTime:null,
+
       },
       // 表单参数
       form: {},
@@ -424,9 +434,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalfirecontrol/person/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -259,7 +268,7 @@ export default {
         introduction: null,
         riverwayLengthCounty: null,
         deptId: null,
-        deptName: null,
+        deptName: 0,
         createName: null,
         updateName: null,
         dataStatus: null,
@@ -387,9 +396,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitalfirecontrol/sensor/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"  @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"   @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -240,7 +249,7 @@ export default {
         longitude: null,
         latitude: null,
         deptId: null,
-        deptName: null,
+        deptName: 0,
         createName: null,
         updateName: null,
         phone:null,
@@ -378,9 +387,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitaltraffic/bridge/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -254,6 +263,8 @@
           pageNum: 1,
           pageSize: 10,
           name: null,
+          deptId: null,
+          deptName: 0,
         },
         // 表单参数
         form: {},
@@ -383,9 +394,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitaltraffic/culvert/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -261,6 +270,8 @@
           pageNum: 1,
           pageSize: 10,
           name: null,
+          deptId: null,
+          deptName:0
         },
         // 表单参数
         form: {},
@@ -390,9 +401,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitaltraffic/hub/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="路口名称" prop="crossingName">
         <el-input
           v-model="queryParams.crossingName"
@@ -28,7 +28,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -195,7 +203,7 @@
                     sectionName: null,
                     congestionPoint: null,
                     deptId: null,
-                    deptName: null,
+                    deptName: 0,
                     createName: null,
                     updateName: null,
                     dataStatus: null
@@ -283,9 +291,14 @@
             },
             /** 重置按钮操作 */
             resetQuery() {
-                this.resetForm("queryForm");
-                this.handleQuery();
+              this.queryParams.deptName = 0;
+              this.resetForm("queryForm");
+              this.handleQuery();
             },
+          // 点击按钮修改是否只查询本级部门用户
+          changeQueryType() {
+            this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+          },
             // 多选框选中数据
             handleSelectionChange(selection) {
                 this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitaltraffic/trafficperson/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -248,7 +257,7 @@ export default {
         introduction: null,
         riverwayLengthCounty: null,
         deptId: null,
-        deptName: null,
+        deptName: 0,
         createName: null,
         updateName: null,
         dataStatus: null,
@@ -362,9 +371,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptName = 0;
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 点击按钮修改是否只查询本级部门用户
+    changeQueryType() {
+      this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

data-ui/src/views/data/digitaltraffic/warningSign/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"  @submit.native.prevent>
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="deptId">
+        <template slot="label">
+          <span @click="changeQueryType" v-if="queryParams.deptName == 0">本级及下级</span>
+          <span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
+        </template>
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
+                    placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+        <el-input v-model="queryParams.deptName" v-if="false"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -231,6 +240,8 @@
           pageNum: 1,
           pageSize: 10,
           name: null,
+          deptId: null,
+          deptName: 0
         },
         // 表单参数
         form: {},
@@ -345,9 +356,14 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.deptName = 0;
         this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 点击按钮修改是否只查询本级部门用户
+      changeQueryType() {
+        this.queryParams.deptName = this.queryParams.deptName == 0 ? 1 : 0;
+      },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)

src/main/resources/mapper/digitalemergency/CenterdataTEmergencyEnterprisesMapper.xml

@@ -38,7 +38,6 @@
         <where>
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
             <if test="address != null  and address != ''">and address = #{address}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="longitude != null  and longitude != ''">and longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''">and latitude = #{latitude}</if>
             <if test="category != null  and category != ''">and category = #{category}</if>
@@ -52,6 +51,14 @@
             <if test="contacts != null  and contacts != ''">and contacts =
                 #{contacts}
             </if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitalemergency/CenterdataTEmergencyMaterialMapper.xml

@@ -76,6 +76,14 @@
             </if>
             <if test="createTime != null ">and create_time = #{createTime}</if>
             <if test="updateTime != null ">and update_time = #{updateTime}</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitalemergency/CenterdataTEmergencyTeamMapper.xml

@@ -44,8 +44,14 @@
             <if test="dataDeptId != null  and dataDeptId != ''">and a.data_dept_id = #{dataDeptId}</if>
             <if test="dataStatus != null  and dataStatus != ''">and a.data_status = #{dataStatus}</if>
             <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
-            <if test="deptId != null ">and a.dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and a.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="teamType != null  and teamType != ''">and a.team_type = #{teamType}</if>
             <if test="teamNature != null  and teamNature != ''">and a.team_nature = #{teamNature}</if>
             <if test="expertiseAreas != null  and expertiseAreas != ''">and a.expertise_areas = #{expertiseAreas}</if>

src/main/resources/mapper/digitalemergency/CenterdataTEmergencyWarehouseMapper.xml

@@ -35,8 +35,14 @@
             <if test="name != null  and name != ''">and name like concat('%',
                 #{name}, '%')
             </if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="longitude != null  and longitude != ''">and longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''">and latitude = #{latitude}</if>
             <if test="createName != null  and createName != ''">and create_name like concat('%', #{createName}, '%')

src/main/resources/mapper/digitalenvironment/CenterdataTEnvironmentBiggasMapper.xml

@@ -34,8 +34,14 @@
         <where>
             <if test="gasName != null  and gasName != ''">and a.gas_name like concat('%', #{gasName}, '%')</if>
             <if test="address != null  and address != ''">and a.address like concat('%', #{address}, '%')</if>
-            <if test="deptId != null ">and a.dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and a.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="createName != null  and createName != ''">and a.create_name like concat('%', #{createName}, '%')
             </if>
             <if test="updateName != null  and updateName != ''">and a.update_name like concat('%', #{updateName}, '%')

src/main/resources/mapper/digitalenvironment/CenterdataTEnvironmentKeyEnterpriseMapper.xml

@@ -42,6 +42,14 @@
             <if test="address != null  and address != ''">and address like concat('%', #{address}, '%')</if>
             <if test="legalPerson != null  and legalPerson != ''">and legal_person like concat('%', #{legalPerson}, '%')</if>
             <if test="code != null  and code != ''">and CODE like concat('%', #{code}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitalenvironment/CenterdataTEnvironmentPersonMapper.xml

@@ -46,8 +46,14 @@
             <if test="riverwayLengthCounty != null  and riverwayLengthCounty != ''">and riverway_length_county =
                 #{riverwayLengthCounty}
             </if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="createName != null  and createName != ''">and create_name like concat('%', #{createName}, '%')
             </if>
             <if test="updateName != null  and updateName != ''">and update_name like concat('%', #{updateName}, '%')

src/main/resources/mapper/digitalenvironment/CenterdataTEnvironmentSewageOutletMapper.xml

@@ -44,7 +44,14 @@
             <if test="sewageTwoClassification != null  and sewageTwoClassification != ''">and sewage_two_classification
                 = #{sewageTwoClassification}
             </if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="notes != null  and notes != ''">and notes = #{notes}</if>
             <if test="type != null  and type != ''">and type = #{type}</if>
             ${params.dataScope}

src/main/resources/mapper/digitalenvironment/CenterdataTEnvironmentSourcePollutionMapper.xml

@@ -38,6 +38,14 @@
             <if test="name != null  and name != ''">and NAME like concat('%', #{name}, '%')</if>
             <if test="address != null  and address != ''">and address like concat('%', #{address}, '%')</if>
             <if test="type != null ">and type = #{type}</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitalenvironment/CenterdataTEnvironmentWaterMonitorMapper.xml

@@ -37,8 +37,14 @@
         select a.* from centerdata_t_environment_water_monitor a
         left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
         <where>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name = #{deptName}</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="longitude != null  and longitude != ''">and longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''">and latitude = #{latitude}</if>
             <if test="district != null  and district != ''">and district = #{district}</if>

src/main/resources/mapper/digitalenvironment/CenterdataTStrawLeaveFieldMapper.xml

@@ -57,8 +57,14 @@
             <if test="createTime != null ">and a.create_time = #{createTime}</if>
             <if test="updateTime != null ">and a.update_time = #{updateTime}</if>
             <if test="remarks != null  and remarks != ''">and a.remarks = #{remarks}</if>
-            <if test="deptId != null ">and a.dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and a.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         ORDER BY a.leave_time DESC,a.create_time DESC
@@ -92,7 +98,14 @@
             <if test="createTime != null ">and a.create_Time = #{createTime}</if>
             <if test="updateTime != null ">and a.update_Time = #{updateTime}</if>
             <if test="remarks != null  and remarks != ''">and a.remarks = #{remarks}</if>
-            <if test="deptName != null  and deptName != ''">and a.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         ORDER BY a.leave_time DESC,a.create_time DESC
@@ -127,8 +140,14 @@
             <if test="createTime != null ">and a.create_Time = #{createTime}</if>
             <if test="updateTime != null ">and a.update_Time = #{updateTime}</if>
             <if test="remarks != null  and remarks != ''">and a.remarks like concat('%', #{remarks}, '%')</if>
-            <if test="deptId != null ">and a.dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and a.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         ORDER BY a.leave_time DESC,a.create_time DESC

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolBasicLinkageForceMapper.xml

@@ -54,6 +54,14 @@
             <if test="createTime != null ">and create_time = #{createTime}</if>
             <if test="updateName != null and updateName != ''">and updat_name = #{updateName}</if>
             <if test="updateTime != null ">and update_time = #{updateTime}</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolFireForceMapper.xml

@@ -55,6 +55,14 @@
             <if test="createTime != null ">and create_time = #{createTime}</if>
             <if test="updateName != null and updateName != ''">and updat_name = #{updateName}</if>
             <if test="updateTime != null ">and update_time = #{updateTime}</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolFireKeyPlacesMapper.xml

@@ -37,8 +37,14 @@
             <if test="phone != null  and phone != ''">and phone = #{phone}</if>
             <if test="longitude != null  and longitude != ''">and longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''">and latitude = #{latitude}</if>
-            <if test="deptId != null  and deptId != ''">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="createName != null and createName != ''">and create_name = #{createName}</if>
             <if test="createTime != null ">and create_time = #{createTime}</if>
             <if test="updateName != null and updateName != ''">and updat_name = #{updateName}</if>

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolFirePressureSensorMapper.xml

@@ -40,8 +40,14 @@
             <if test="parameters != null  and parameters != ''">and parameters = #{parameters}</if>
             <if test="longitude != null  and longitude != ''">and longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''">and latitude = #{latitude}</if>
-            <if test="deptId != null  and deptId != ''">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="createName != null  and createName != ''">and create_name like concat('%', #{createName}, '%')
             </if>
             <if test="updateName != null  and updateName != ''">and update_name like concat('%', #{updateName}, '%')

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolFoamLiquidMapper.xml

@@ -48,6 +48,14 @@
             <if test="createTime != null ">and create_time = #{createTime}</if>
             <if test="updateName != null and updateName != ''">and updat_name = #{updateName}</if>
             <if test="updateTime != null ">and update_time = #{updateTime}</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolFulltimeStationMapper.xml

@@ -42,6 +42,14 @@
             <if test="createTime != null ">and create_time = #{createTime}</if>
             <if test="updateName != null and updateName != ''">and updat_name = #{updateName}</if>
             <if test="updateTime != null ">and update_time = #{updateTime}</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolOtherLinkageForceMapper.xml

@@ -43,6 +43,14 @@
             <if test="createTime != null ">and create_time = #{createTime}</if>
             <if test="updateName != null and updateName != ''">and updat_name = #{updateName}</if>
             <if test="updateTime != null ">and update_time = #{updateTime}</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolPersonMapper.xml

@@ -46,8 +46,14 @@
             <if test="riverwayLengthCounty != null  and riverwayLengthCounty != ''">and riverway_length_county =
                 #{riverwayLengthCounty}
             </if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="createName != null  and createName != ''">and create_name like concat('%', #{createName}, '%')
             </if>
             <if test="updateName != null  and updateName != ''">and update_name like concat('%', #{updateName}, '%')

src/main/resources/mapper/digitalresource/CenterdataTFarmBasicFarmlandMapper.xml

@@ -48,8 +48,14 @@
             <if test="createTime != null ">and create_time = #{createTime}</if>
             <if test="updateTime != null ">and update_time = #{updateTime}</if>
             <if test="remarks != null  and remarks != ''">and remarks = #{remarks}</if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         order by a.create_time desc

src/main/resources/mapper/digitaltraffic/CenterdataTBridgeMapper.xml

@@ -58,8 +58,14 @@
         <where>
             <if test="name != null  and name != ''">AND name LIKE concat('%', #{name}, '%')</if>
             <if test="dataStatus != null  and dataStatus != ''">AND data_status = #{dataStatus}</if>
-            <if test="deptId != null ">AND dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">AND dept_name LIKE concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         ORDER BY a.completion_date DESC,a.create_time DESC

src/main/resources/mapper/digitaltraffic/CenterdataTCulvertMapper.xml

@@ -58,8 +58,14 @@
         <where>
             <if test="name != null  and name != ''">AND name LIKE concat('%', #{name}, '%')</if>
             <if test="dataStatus != null  and dataStatus != ''">AND data_status = #{dataStatus}</if>
-            <if test="deptId != null ">AND dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">AND dept_name LIKE concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         ORDER BY a.completion_date desc , a.create_time DESC

src/main/resources/mapper/digitaltraffic/CenterdataTTrafficTransportationHubMapper.xml

@@ -34,8 +34,14 @@
             <if test="sectionName != null  and sectionName != ''">and section_name like concat('%', #{sectionName}, '%')
             </if>
             <if test="congestionPoint != null  and congestionPoint != ''">and congestion_point like concat('%', #{congestionPoint}, '%')</if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="createName != null  and createName != ''">and create_name like concat('%', #{createName}, '%')
             </if>
             <if test="updateName != null  and updateName != ''">and update_name like concat('%', #{updateName}, '%')

src/main/resources/mapper/digitaltraffic/CenterdataTUnobstructedPersonMapper.xml

@@ -45,8 +45,14 @@
             <if test="riverwayLengthCounty != null  and riverwayLengthCounty != ''">and riverway_length_county =
                 #{riverwayLengthCounty}
             </if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="createName != null  and createName != ''">and create_name like concat('%', #{createName}, '%')
             </if>
             <if test="updateName != null  and updateName != ''">and update_name like concat('%', #{updateName}, '%')

src/main/resources/mapper/digitaltraffic/CenterdataTWarningSignMapper.xml

@@ -52,8 +52,14 @@
         <where>
             <if test="name != null  and name != ''">AND name LIKE concat('%', #{name}, '%')</if>
             <if test="dataStatus != null  and dataStatus != ''">AND data_status = #{dataStatus}</if>
-            <if test="deptId != null ">AND dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">AND dept_name LIKE concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             ${params.dataScope}
         </where>
         ORDER BY a.set_time DESC, a.create_time DESC