From 065c3107f4e3bd46c843e17da7496be64b1efe29 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Thu, 16 May 2024 08:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E6=96=87=E4=BB=B6=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filemanager/TdFileExtractController.java  | 12 +++---
 .../filemanager/TdFileReceiveController.java  |  9 ++++-
 .../system/fileprovide/fileprovide.html       | 37 -------------------
 .../system/filereceive/filereceive.html       |  6 +--
 4 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java
index 728f537..f0d19ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java
@@ -48,14 +48,14 @@ public class TdFileExtractController extends BaseController {
     public TableDataInfo list(TdFileReceive tdFileReceive)
     {
         startPage();
-        List<TdFileReceive> tdFileReceives = tdFileReceiveService.selectTdFileReceiveByReceiveDepart(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName());
-        List<TdFileReceive> tdFileReceiveList = new ArrayList<>();
-        for (TdFileReceive tdFileReceivelist : tdFileReceives){
-            if (tdFileReceivelist.getReceiveState().equals("1")){
-                tdFileReceiveList.add(tdFileReceivelist);
+        List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
+        List<TdFileReceive> tdFileReceives = new ArrayList<>();
+        for (TdFileReceive FileReceivelist : list){
+            if (FileReceivelist.getReceiveState().equals("1") && FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
+                tdFileReceives.add(FileReceivelist);
             }
         }
-        return getDataTable(tdFileReceiveList);
+        return getDataTable(tdFileReceives);
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java
index f9bfd1b..6c7c996 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system.filemanager;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.ruoyi.system.service.ISysDeptService;
@@ -55,7 +56,13 @@ public class TdFileReceiveController extends BaseController
     public TableDataInfo list(TdFileReceive tdFileReceive)
     {
         startPage();
-        List<TdFileReceive> tdFileReceives = tdFileReceiveService.selectTdFileReceiveByReceiveDepart(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName());
+        List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
+        List<TdFileReceive> tdFileReceives = new ArrayList<>();
+        for (TdFileReceive FileReceivelist : list){
+            if (FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
+                tdFileReceives.add(FileReceivelist);
+            }
+        }
         return getDataTable(tdFileReceives);
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
index efb0ba0..82b572d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
@@ -107,14 +107,6 @@
                        return $.table.selectDictLabel(instancyExtentDatas, value);
                     }
                 },
-                // {
-                //     field: 'allianceFile',
-                //     title: '定密依据'
-                // },
-                // {
-                //     field: 'remark',
-                //     title: '文件备注'
-                // },
                 {
                     field: 'frameworkId',
                     title: '所属地区'
@@ -126,35 +118,6 @@
                        return $.table.selectDictLabel(fileSecretDatas, value);
                     }
                 },
-
-                // {
-                //     field: 'fileSecretyj',
-                //     title: '文件'
-                // },
-                // {
-                //     field: 'filePurpose',
-                //     title: ''
-                // },
-                // {
-                //     field: 'fileCode',
-                //     title: ''
-                // },
-                // {
-                //     field: 'receiveUser',
-                //     title: ''
-                // },
-                // {
-                //     field: 'receiveCount',
-                //     title: ''
-                // },
-                // {
-                //     field: 'operateId',
-                //     title: ''
-                // },
-                // {
-                //     field: 'areaid',
-                //     title: '所属区县'
-                // },
                 {
                     title: '操作',
                     align: 'center',
diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
index 1904074..2403a48 100644
--- a/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
+++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
@@ -39,10 +39,6 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:filereceive:remove">
-                <i class="fa fa-remove"></i> 删除
-            </a>
             <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:filereceive:export">
                 <i class="fa fa-download"></i> 导出
             </a>
@@ -118,7 +114,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>接收</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.receiveId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        //actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.receiveId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]