From c28549316bd286a36d5ef7273d68c18c93c0b907 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 26 Jul 2024 16:30:29 +0800
Subject: [PATCH] bug

---
 fuintAdmin_zt/src/api/system/Site/site.js     |  8 ++++++++
 .../src/views/components/Service/staff.vue    | 13 +++++++------
 .../src/views/components/Service/way.vue      |  8 ++++----
 .../src/views/homeComponents/agent.vue        |  2 +-
 .../dept/controller/SysDeptController.java    |  9 +++++++++
 .../system/dept/service/ISysDeptService.java  |  2 ++
 .../dept/service/impl/SysDeptServiceImpl.java | 19 ++++++++++++++++++-
 7 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/fuintAdmin_zt/src/api/system/Site/site.js b/fuintAdmin_zt/src/api/system/Site/site.js
index 04ea802fa..7ca0cfb0a 100644
--- a/fuintAdmin_zt/src/api/system/Site/site.js
+++ b/fuintAdmin_zt/src/api/system/Site/site.js
@@ -17,6 +17,14 @@ export function Userlist(id) {
 
   })
 }
+// 查询用户列表？？  获取部门信息
+export function getPidInfo(id) {
+  return request({
+    url: '/system/dept/getPidInfo/'+id,
+    method: 'get',
+
+  })
+}
 
 export function getMaxNumber(data) {
   return request({
diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue
index 7bcd27f95..a631016ac 100644
--- a/fuintAdmin_zt/src/views/components/Service/staff.vue
+++ b/fuintAdmin_zt/src/views/components/Service/staff.vue
@@ -17,10 +17,11 @@
          <el-button
            type="primary"
            icon="el-icon-search"
-
+           @click="handleQuery"
          >搜索</el-button>
          <el-button
            icon="el-icon-refresh-right"
+           @click="resetQuery"
          >重置</el-button>
          <el-button
            type="primary"
@@ -63,11 +64,11 @@
             <dict-tag :options="dict.type.display" :value="scope.row.isRefuel"/>
           </template>
         </el-table-column>
-        <el-table-column label="收款通知" align="center" prop="notice">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.notice" :value="scope.row.notice"/>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="收款通知" align="center" prop="notice">-->
+<!--          <template slot-scope="scope">-->
+<!--            <dict-tag :options="dict.type.notice" :value="scope.row.notice"/>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="创建时间" align="center" prop="createTime" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
diff --git a/fuintAdmin_zt/src/views/components/Service/way.vue b/fuintAdmin_zt/src/views/components/Service/way.vue
index 19eb90378..524fef8a7 100644
--- a/fuintAdmin_zt/src/views/components/Service/way.vue
+++ b/fuintAdmin_zt/src/views/components/Service/way.vue
@@ -1,12 +1,12 @@
 <script >
-import {Userlist} from "@/api/system/Site/site";
+import {getPidInfo, Userlist} from "@/api/system/Site/site";
 import Yearff from "@/views/Site/components/yearff.vue";
 import Beforeff from "@/views/Site/components/before.vue";
 import Afterff from "@/views/Site/components/afterff.vue";
 
 export default {
   components: {Afterff, Beforeff, Yearff},
-  props:['deptId'],
+  props:['deptId','id'],
   data() {
     return {
       value: true,
@@ -35,7 +35,7 @@ export default {
   },
   methods:{
     getInfo(){
-      Userlist(this.deptId).then(res => {
+      getPidInfo(this.deptId).then(res => {
         this.storeDeptInfo = res.data
       })
     },
@@ -91,7 +91,7 @@ export default {
         <div class="left-size">可创建油站站点数量：</div>
         <div>{{ storeDeptInfo.storeNum }}</div>
       </div>
-      <div class="d-s">
+      <div class="d-s" style="margin-top: 15px">
         <div class="left-size">机构状态：</div>
         <div>
           <el-switch
diff --git a/fuintAdmin_zt/src/views/homeComponents/agent.vue b/fuintAdmin_zt/src/views/homeComponents/agent.vue
index 81c9832a8..bbbc2e93f 100644
--- a/fuintAdmin_zt/src/views/homeComponents/agent.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/agent.vue
@@ -168,7 +168,7 @@ import {selectChildByDeptId} from "@/api/system/Site/site";
 import {parseTime} from "@/utils/fuint";
 import {getBannerListApi} from "@/api/sys/banner";
 import {getListApi} from "@/api/setting/hardware";
-import {getNotificationlogList, getSysNotifyList} from "@/api/sys/sysNotificationlog";
+import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
 export default {
 
   props:["accountId"],
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
index 2d3f0344c..45e9cdbb6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
@@ -234,4 +234,13 @@ public class SysDeptController extends BaseController
         return getSuccessResult(sysDept);
     }
 
+    /**
+     * 根据deptid查询父级的部门信息（中台首页）
+     * @param deptId
+     * @return
+     */
+    @GetMapping("getPidInfo/{deptId}")
+    public ResponseObject getPidInfo(@PathVariable Long deptId){
+        return getSuccessResult(deptService.getPidInfo(deptId));
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/ISysDeptService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/ISysDeptService.java
index 9b699a2ba..335a1c246 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/ISysDeptService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/ISysDeptService.java
@@ -147,4 +147,6 @@ public interface ISysDeptService extends IService<SysDept>
 //    boolean getListByParentId(Integer deptId);
 
     int getMaxNumber(SysDept dept);
+
+    SysDept getPidInfo(Long deptId);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java
index 4deb57490..f7abaafbf 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java
@@ -650,7 +650,24 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper,SysDept> imple
         }*/
     }
 
-        public SysDept recursion (SysDept dept){
+    @Override
+    public SysDept getPidInfo(Long deptId) {
+        SysDept sysDept = selectDeptById(deptId);
+        if (ObjectUtil.isNotEmpty(sysDept) && !sysDept.getAncestors().equals("0,100")){
+            sysDept = getInfoByPid(sysDept);
+        }
+        return sysDept;
+    }
+
+    private SysDept getInfoByPid(SysDept sysDept){
+        if (ObjectUtil.isNotEmpty(sysDept) && !sysDept.getAncestors().equals("0,100")){
+            sysDept = selectDeptById(sysDept.getParentId());
+            sysDept = getInfoByPid(sysDept);
+        }
+        return sysDept;
+    }
+
+    public SysDept recursion (SysDept dept){
             List<SysDept> sysDepts = this.selectDept(dept.getParentId());
             if (ObjectUtils.isNotEmpty(sysDepts) && ObjectUtils.isNotEmpty(sysDepts.get(0).getParentId())) {
                 if (sysDepts.get(0).getParentId() == 100) {