update code

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysDeptController.java

@@ -1,5 +1,6 @@
 package com.yanzhu.system.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -7,6 +8,7 @@ import com.yanzhu.common.core.constant.CacheConstants;
 import com.yanzhu.common.core.constant.Constants;
 import com.yanzhu.common.core.enums.IsDelEnums;
 import com.yanzhu.common.redis.service.RedisService;
+import com.yanzhu.system.domain.vo.TreeSelect;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -159,4 +161,14 @@ public class SysDeptController extends BaseController
         redisService.setCacheObject(key,depts, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
         return success(depts);
     }
+    @RequiresPermissions("system:dept:list")
+    @GetMapping("/deptTree")
+    public AjaxResult userDeptTree(){
+        SysDept comp= SecurityUtils.getLoginUser().getSysUser().getComp();
+        if(comp==null){
+            return  success(deptService.buildDeptTreeSelect(new ArrayList<>()));
+        }
+        List<TreeSelect> treeList = deptService.buildDeptTreeSelect(deptService.selectDeptListForComp(comp));
+        return success(treeList);
+    }
 }

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java

@@ -19,6 +19,11 @@ public interface SysDeptMapper
      */
     public List<SysDept> selectDeptList(SysDept dept);
 
+
+    /**
+     * 根据deptId查询此ID及下面的子项，用于构建树
+     */
+    public List<SysDept> selectDeptListForComp(SysDept dept);
     /**
      * 根据角色ID查询部门树信息
      * 

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDeptService.java

@@ -121,4 +121,8 @@ public interface ISysDeptService
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+    /**
+     * 根据deptId查询此ID及下面的子项，用于构建树
+     */
+    List<SysDept> selectDeptListForComp(SysDept comp);
 }

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDeptServiceImpl.java

@@ -293,6 +293,13 @@ public class SysDeptServiceImpl implements ISysDeptService
     {
         return deptMapper.deleteDeptById(deptId);
     }
+    /**
+     * 根据deptId查询此ID及下面的子项，用于构建树
+     */
+    @Override
+    public List<SysDept> selectDeptListForComp(SysDept comp) {
+        return deptMapper.selectDeptListForComp(comp);
+    }
 
     /**
      * 递归列表

yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -56,7 +56,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		order by d.parent_id, d.order_num
     </select>
-    
+	<select id="selectDeptListForComp" parameterType="SysDept" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where d.del_flag = '0'
+		<if test="deptId != null and deptId != 0">
+			AND(find_in_set( #{deptId}, ancestors) or dept_id= #{deptId})
+		</if>
+		order by d.parent_id, d.order_num
+	</select>
     <select id="selectDeptListByRoleId" resultType="Long">
 		select d.dept_id
 		from sys_dept d

yanzhu-ui-vue3/src/api/system/dept.js

@@ -58,3 +58,10 @@ export function projectDeptList() {
     method: 'get'
   })
 }
+
+export function deptTree(){
+  return request({
+    url: '/system/dept/deptTree',
+    method: 'get'
+  })
+}

yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue

@@ -2,21 +2,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="项目名称" prop="projectName">
-        <el-input
+        <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
-          v-model="queryParams.projectName"
-          placeholder="请输入项目名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="项目类型" prop="projectType">
         <el-select v-model="queryParams.projectType" placeholder="请选择项目类型" clearable>
-          <el-option
+          <el-option v-for="dict in pro_project_type" :key="dict.value" :label="dict.label"
-            v-for="dict in pro_project_type"
+            :value="dict.value"></el-option>
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -27,59 +18,37 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          type="primary"
+          v-hasPermi="['manage:proProjectInfo:add']">新增</el-button>
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['manage:proProjectInfo:add']"
-        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          type="success"
+          v-hasPermi="['manage:proProjectInfo:edit']">修改</el-button>
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['manage:proProjectInfo:edit']"
-        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          type="danger"
+          v-hasPermi="['manage:proProjectInfo:remove']">删除</el-button>
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['manage:proProjectInfo:remove']"
-        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="Download" @click="handleExport"
-          type="warning"
+          v-hasPermi="['manage:proProjectInfo:export']">导出</el-button>
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['manage:proProjectInfo:export']"
-        >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="proProjectInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="项目名称" align="center" prop="projectName" width="250"/>
+      <el-table-column label="项目名称" align="center" prop="projectName" width="250" />
-      <el-table-column label="项目部门" align="center" prop="deptName" width="200"/>
+      <el-table-column label="项目部门" align="center" prop="deptName" width="200" />
       <el-table-column label="项目简称" align="center" prop="simpleName" />
       <el-table-column label="项目类型" align="center" prop="projectType" width="100">
         <template #default="scope">
-          <dict-tag :options="pro_project_type" :value="scope.row.projectType"/>
+          <dict-tag :options="pro_project_type" :value="scope.row.projectType" />
         </template>
       </el-table-column>
       <el-table-column label="二维码" align="center" prop="projectQrCode" width="80">
         <template #default="scope">
-          <image-preview :src="scope.row.projectQrCode" :width="50" :height="50"/>
+          <image-preview :src="scope.row.projectQrCode" :width="50" :height="50" />
         </template>
       </el-table-column>
       <el-table-column label="项目排序" align="center" prop="projectSort" width="120">
@@ -88,9 +57,9 @@
             @change="setProjectSort(scope.row, $event)"></el-input-number>
         </template>
       </el-table-column>
-      <el-table-column label="项目地址" align="center" prop="projectAddress" width="250"/>
+      <el-table-column label="项目地址" align="center" prop="projectAddress" width="250" />
-      <el-table-column label="负责人" align="center" prop="projectPerson" width="100"/>
+      <el-table-column label="负责人" align="center" prop="projectPerson" width="100" />
-      <el-table-column label="负责人电话" align="center" prop="projectPersonPhone" width="120"/>
+      <el-table-column label="负责人电话" align="center" prop="projectPersonPhone" width="120" />
       <el-table-column label="项目工期" align="center" prop="projectTimeLimit" width="120">
         <template #default="scope">
           <el-tag effect="plain">
@@ -98,14 +67,14 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="总投资" align="center" prop="totalInvestment" >
+      <el-table-column label="总投资" align="center" prop="totalInvestment">
         <template #default="scope">
           <el-tag effect="dark">
             {{ scope.row.totalInvestment + ' 万元' }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="合同金额" align="center" prop="contractAmount" >
+      <el-table-column label="合同金额" align="center" prop="contractAmount">
         <template #default="scope">
           <el-tag effect="dark">
             {{ scope.row.contractAmount + ' 万元' }}
@@ -114,16 +83,16 @@
       </el-table-column>
       <el-table-column label="项目进度" align="center" prop="projectSchedule">
         <template #default="scope">
-          <dict-tag :options="pro_project_schedule" :value="scope.row.projectSchedule"/>
+          <dict-tag :options="pro_project_schedule" :value="scope.row.projectSchedule" />
         </template>
       </el-table-column>
-      <el-table-column label="计划开始时间" align="center" prop="scheduledStartTime" width="120"/>
+      <el-table-column label="计划开始时间" align="center" prop="scheduledStartTime" width="120" />
-      <el-table-column label="计划完工时间" align="center" prop="plannedCompletionTime" width="120"/>
+      <el-table-column label="计划完工时间" align="center" prop="plannedCompletionTime" width="120" />
-      <el-table-column label="实际开始时间" align="center" prop="actualOperatingTime" width="120"/>
+      <el-table-column label="实际开始时间" align="center" prop="actualOperatingTime" width="120" />
-      <el-table-column label="实际完工时间" align="center" prop="actualCompletionTime" width="120"/>
+      <el-table-column label="实际完工时间" align="center" prop="actualCompletionTime" width="120" />
       <el-table-column label="项目状态" align="center" prop="isDel">
         <template #default="scope">
-          <dict-tag :options="sys_is_del" :value="scope.row.isDel"/>
+          <dict-tag :options="sys_is_del" :value="scope.row.isDel" />
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -133,54 +102,36 @@
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:proProjectInfo:edit']">修改</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:proProjectInfo:remove']">删除</el-button>
+            v-hasPermi="['manage:proProjectInfo:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['manage:proProjectInfo:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-show="total>0"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改项目信息对话框 -->
     <el-dialog :title="title" v-model="open" width="1080px" append-to-body>
       <el-form ref="proProjectInfoRef" :model="form" :rules="rules" label-width="100px">
-        <el-tabs
+        <el-tabs v-model="activeName" type="card" class="demo-tabs">
-          v-model="activeName"
-          type="card"
-          class="demo-tabs"
-        >
           <el-tab-pane label="项目基本信息" name="base">
             <el-row :gutter="20">
               <el-col :span="16">
-                <el-form-item label="所属部门" prop="deptId">
+                <el-form-item label="归属单位" prop="deptId">
-                  <el-tree-select
+                  <el-select v-model="form.deptId" placeholder="请选择公司" clearable>
-                    v-model="form.deptId"
+                    <el-option v-for="dict in deptOptions" :key="dict.deptId" :label="dict.deptName"
-                    :data="deptOptions"
+                      :value="dict.deptId"></el-option>
-                    :props="{ value: 'id', label: 'label', children: 'children' }"
+                  </el-select>
-                    value-key="id"
-                    placeholder="请选择所属部门"
-                    check-strictly
-                    style="width:100%"
-                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="显示层级" prop="disDeptId">
-                  <el-tree-select
+                  <el-tree-select v-model="form.disDeptId" :data="deptOptions"
-                    v-model="form.disDeptId"
+                    :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择显示层级"
-                    :data="deptOptions"
+                    check-strictly style="width:100%" />
-                    :props="{ value: 'id', label: 'label', children: 'children' }"
-                    value-key="id"
-                    placeholder="请选择显示层级"
-                    check-strictly
-                    style="width:100%"
-                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -200,12 +151,8 @@
               <el-col :span="8">
                 <el-form-item label="项目类型" prop="projectType">
                   <el-select v-model="form.projectType" placeholder="请选择项目类型" style="width:100%">
-                    <el-option
+                    <el-option v-for="dict in pro_project_type" :key="dict.value" :label="dict.label"
-                      v-for="dict in pro_project_type"
+                      :value="dict.value"></el-option>
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -223,13 +170,11 @@
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-form-item label="项目地址" prop="projectAddress">
-                  <el-input
+                  <el-input v-model="addressInfos" placeholder="请选择项目地址信息" @focus="getMapInfo">
-                    v-model="addressInfos"
-                    placeholder="请选择项目地址信息"
-                    @focus="getMapInfo"
-                  >
                     <template #prefix>
-                      <el-icon class="el-input__icon"><Location /></el-icon>
+                      <el-icon class="el-input__icon">
+                        <Location />
+                      </el-icon>
                     </template>
                   </el-input>
                 </el-form-item>
@@ -238,7 +183,7 @@
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="项目工期" prop="projectTimeLimit">
-                  <el-input v-model.number="form.projectTimeLimit" maxlength="10" show-word-limit placeholder="请输入项目工期" >
+                  <el-input v-model.number="form.projectTimeLimit" maxlength="10" show-word-limit placeholder="请输入项目工期">
                     <template #append>天</template>
                   </el-input>
                 </el-form-item>
@@ -269,69 +214,43 @@
               <el-col :span="8">
                 <el-form-item label="项目进度" prop="projectSchedule">
                   <el-select v-model="form.projectSchedule" placeholder="请选择项目进度" style="width:100%">
-                    <el-option
+                    <el-option v-for="dict in pro_project_schedule" :key="dict.value" :label="dict.label"
-                      v-for="dict in pro_project_schedule"
+                      :value="dict.value"></el-option>
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="计划开工时间" prop="scheduledStartTime" >
+                <el-form-item label="计划开工时间" prop="scheduledStartTime">
-                  <el-date-picker
+                  <el-date-picker v-model="form.scheduledStartTime" type="date" placeholder="请选择计划开工时间"
-                    v-model="form.scheduledStartTime"
+                    style="width:100%" />
-                    type="date"
-                    placeholder="请选择计划开工时间"
-                    style="width:100%"
-                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="计划完工时间" prop="plannedCompletionTime">
-                  <el-date-picker
+                  <el-date-picker v-model="form.plannedCompletionTime" type="date" placeholder="请选择计划完工时间"
-                    v-model="form.plannedCompletionTime"
+                    style="width:100%" />
-                    type="date"
-                    placeholder="请选择计划完工时间"
-                    style="width:100%"
-                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="实际开工时间" prop="actualOperatingTime">
-                  <el-date-picker
+                  <el-date-picker v-model="form.actualOperatingTime" type="date" placeholder="请选择实际开工时间"
-                    v-model="form.actualOperatingTime"
+                    style="width:100%" />
-                    type="date"
-                    placeholder="请选择实际开工时间"
-                    style="width:100%"
-                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="实际完工时间" prop="actualCompletionTime">
-                  <el-date-picker
+                  <el-date-picker v-model="form.actualCompletionTime" type="date" placeholder="请选择实际完工时间"
-                    v-model="form.actualCompletionTime"
+                    style="width:100%" />
-                    type="date"
-                    placeholder="请选择实际完工时间"
-                    style="width:100%"
-                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-form-item label="项目概述" prop="projectSummarize">
-                  <el-input
+                  <el-input v-model="form.projectSummarize" type="textarea" :rows="3" placeholder="请输入项目概述"
-                    v-model="form.projectSummarize"
+                    maxlength="1024" show-word-limit />
-                    type="textarea"
-                    :rows="3"
-                    placeholder="请输入项目概述"
-                    maxlength="1024"
-                    show-word-limit
-                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -345,18 +264,15 @@
                 <el-button type="danger" icon="Delete" @click="handleDeleteDepts">删除</el-button>
               </el-col>
             </el-row>
-            <el-table :data="projectDeptsList" :row-class-name="rowProjectDeptsIndex" @selection-change="handleDeptsSelectionChange" ref="projectDeptsRef">
+            <el-table :data="projectDeptsList" :row-class-name="rowProjectDeptsIndex"
+              @selection-change="handleDeptsSelectionChange" ref="projectDeptsRef">
               <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="序号" align="center" prop="index" width="50"/>
+              <el-table-column label="序号" align="center" prop="index" width="50" />
               <el-table-column label="单位类型" prop="deptType" align="center">
                 <template #default="scope">
                   <el-select v-model="scope.row.deptType" placeholder="请选择单位类型">
-                    <el-option
+                    <el-option v-for="dict in pro_dept_type" :key="dict.value" :label="dict.label"
-                      v-for="dict in pro_dept_type"
+                      :value="dict.value"></el-option>
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
                   </el-select>
                 </template>
               </el-table-column>
@@ -383,26 +299,26 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="显示LOGO" prop="orgLogo">
-                  <image-upload v-model="form.setting.orgLogo" :limit="1"/>
+                  <image-upload v-model="form.setting.orgLogo" :limit="1" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="项目平面图" prop="orgPlane">
-                  <image-upload v-model="form.setting.orgPlane" :limit="3"/>
+                  <image-upload v-model="form.setting.orgPlane" :limit="3" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-form-item label="项目图片" prop="orgImage">
-                  <image-upload v-model="form.setting.orgImage" :limit="9"/>
+                  <image-upload v-model="form.setting.orgImage" :limit="9" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-form-item label="项目视频" prop="orgVideo">
-                  <file-upload v-model="form.setting.orgVideo" :limit="1" :fileType="['mp4']" :fileSize="100"/>
+                  <file-upload v-model="form.setting.orgVideo" :limit="1" :fileType="['mp4']" :fileSize="100" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -423,10 +339,10 @@
 
 <script setup name="ProProjectInfo">
 import { deptTreeSelect } from "@/api/system/user";
-import { projectDeptList } from "@/api/system/dept";
+import { projectDeptList, deptTree, listDept } from "@/api/system/dept";
 import { listProProjectInfo, getProProjectInfo, delProProjectInfo, addProProjectInfo, updateProProjectInfo } from "@/api/manage/proProjectInfo";
 import BaiduMap from "@/components/BaiduMap/Map.vue";
-
+import useUserStore from '@/store/modules/user'
 const { proxy } = getCurrentInstance();
 const { pro_project_type, pro_project_schedule, pro_dept_type, sys_is_del } = proxy.useDict('pro_project_type', 'pro_project_schedule', 'pro_dept_type', 'sys_is_del');
 
@@ -446,10 +362,10 @@ const projectDeptsList = ref([]);
 const checkedProjectDepts = ref([]);
 
 const deptOptions = ref([]);
-
+const userStore = useUserStore()
 const data = reactive({
   form: {
-    setting:{}
+    setting: {}
   },
   queryParams: {
     pageNum: 1,
@@ -614,7 +530,7 @@ function handleDeleteDepts() {
   } else {
     const projectDeptsList = projectDeptsList.value;
     const checkedProjectDepts = checkedProjectDepts.value;
-    projectDeptsList.value = projectDeptsList.filter(function(item) {
+    projectDeptsList.value = projectDeptsList.filter(function (item) {
       return checkedProjectDepts.indexOf(item.index) == -1
     });
   }
@@ -662,12 +578,12 @@ function setProjectSort(row, val) {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除项目信息编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除项目信息编号为"' + _ids + '"的数据项？').then(function () {
     return delProProjectInfo(_ids);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  }).catch(() => { });
 }
 
 /** 导出按钮操作 */
@@ -679,13 +595,13 @@ function handleExport() {
 
 /** 查询部门下拉树结构 */
 function getDeptTree() {
-  deptTreeSelect().then(response => {
+  listDept({ deptType: 2 }).then(response => {
     deptOptions.value = response.data;
   });
 };
 
 /** 地图选择 */
-function getMapInfo(){
+function getMapInfo() {
   mapRef.value.showDlg();
 }