diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java
index ddda3b3..b7cb811 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java
@@ -50,7 +50,7 @@ public class SysNetworknumController extends BaseController {
     /**
      * 打印界面
      */
-    @RequiresPermissions("system:propertynum:print")
+    @RequiresPermissions("system:networknum:print")
     @GetMapping("/print/{netId}")
     @Log(title = "网络设备统计", businessType = BusinessType.PRINT)
     public String print(@PathVariable("netId") String netId, ModelMap mmap)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java
index c6cac47..abe7cc8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java
@@ -63,16 +63,16 @@ public class SysTrainnumController extends BaseController {
     }
 
     /**
-     * 打印
+     * 详细
      */
-    @RequiresPermissions("system:trainnum:print")
-    @GetMapping("/print/{traiId}")
-    @ResponseBody
-    public String print(@PathVariable("trainId") Long trainId, ModelMap mmap){
-        TdTrain tdTrain = tdTrainService.selectTdTrainByID(trainId);
-        List<TdTrain> tdTrains = tdTrainService.selectTdTrainList(tdTrain);
-        mmap.put("train", tdTrain);
-        return prefix + "/print";
+    @RequiresPermissions("system:trainnum:detail")
+    @GetMapping("/detail/{ID}")
+    public String detail(@PathVariable("ID") Long ID, ModelMap mmap)
+    {
+        mmap.put("tdTrain", tdTrainService.selectTdTrainByID(ID));
+        SysUser user = getSysUser();
+        mmap.put("user", user);
+        return prefix + "/detail";
     }
 
 }
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 819d60a..44f9198 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
@@ -49,7 +49,7 @@ public class TdFileExtractController extends BaseController {
         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())){
+            if (FileReceivelist.getReceiveState().equals("1") && FileReceivelist.getReceiveDepartid().equals(getSysUser().getDept().getDeptName())){
                 tdFileReceives.add(FileReceivelist);
             }
         }
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 6c7c996..b7bf773 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
@@ -59,7 +59,7 @@ public class TdFileReceiveController extends BaseController
         List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
         List<TdFileReceive> tdFileReceives = new ArrayList<>();
         for (TdFileReceive FileReceivelist : list){
-            if (FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
+            if (FileReceivelist.getReceiveDepartid().equals(getSysUser().getDept().getDeptName())){
                 tdFileReceives.add(FileReceivelist);
             }
         }
diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html
index 8ddb7e6..5332931 100644
--- a/ruoyi-admin/src/main/resources/templates/index-topnav.html
+++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html
@@ -246,7 +246,7 @@
 				</div>
                 <!-- 右侧栏 -->
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>
+<!--                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
                     <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
 	                <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="#" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
                 
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 08e454b..f6a054a 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -72,7 +72,7 @@
 					</ul>
                 </li>
                 <li th:if="${demoEnabled}">
-					<a href="#"><i class="fa fa-desktop"></i><span class="nav-label">实例演示</span><span class="fa arrow"></span></a>
+<!--					<a href="#"><i class="fa fa-desktop"></i><span class="nav-label">实例演示</span><span class="fa arrow"></span></a>-->
                     <ul class="nav nav-second-level collapse">
                         <li> <a>表单<span class="fa arrow"></span></a>
                             <ul class="nav nav-third-level">
@@ -193,7 +193,7 @@
                     </a>
                 </div>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>
+<!--                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
                     <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
 	                <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="#" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
                     <li class="dropdown user-menu">
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html
index 32a004f..a7331b3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html
@@ -21,9 +21,9 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">所属地市：</label>
+            <label class="col-sm-3 control-label ">所属地市：</label>
             <div class="col-sm-8">
-                <select id="City" name="frameworkId" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
+                <select id="City" name="frameworkId" disabled @change="getAreaList()" v-model="City" class="form-control m-b">
                     <option value="">请选择</option>
                     <option v-for="option in CityList" :value="option.id" :key="option.id">
                         {{ option.name }}
@@ -32,9 +32,9 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">所属区县：</label>
+            <label class="col-sm-3 control-label ">所属区县：</label>
             <div class="col-sm-8">
-                <select id="Area" name="areaid" disabled required v-model="Area" class="form-control m-b">
+                <select id="Area" name="areaid" disabled v-model="Area" class="form-control m-b">
                     <option value="">请选择</option>
                     <option v-for="option in AreaList" :value="option.id" :key="option.id">
                         {{ option.name }}
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/networknum/networknum.html b/ruoyi-admin/src/main/resources/templates/system/network/networknum/networknum.html
index 3d4e5ef..370d3b2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/networknum/networknum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/networknum/networknum.html
@@ -58,6 +58,7 @@
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('system:network:edit')}]];
+    var printFlag = [[${@permission.hasPermi('system:networknum:print')}]];
     var removeFlag = [[${@permission.hasPermi('system:network:remove')}]];
     var listFlag = [[${@permission.hasPermi('system:network:list')}]];
     var netMijiDatas = [[${@dict.getType('sys_file_miji')}]];
@@ -130,7 +131,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="print(\'' + row.netId + '\')"><i class="fa fa-download"></i>打印</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + printFlag + '" href="javascript:void(0)" onclick="print(\'' + row.netId + '\')"><i class="fa fa-download"></i>打印</a> ');
                         return actions.join('');
                     }
                 }]
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html
index 7fc61a9..e22e836 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/propertynum.html
@@ -49,6 +49,7 @@
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('system:property:edit')}]];
+    var printFlag = [[${@permission.hasPermi('system:propertynum:print')}]];
     var removeFlag = [[${@permission.hasPermi('system:property:remove')}]];
     var listFlag = [[${@permission.hasPermi('system:property:list')}]];
     var prefix = ctx + "system/propertynum";
@@ -149,7 +150,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="print(\'' + row.useId + '\')"><i class="fa fa-download"></i>打印</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + printFlag + '" href="javascript:void(0)" onclick="print(\'' + row.useId + '\')"><i class="fa fa-download"></i>打印</a> ');
                         return actions.join('');
                     }
                 }]
diff --git a/ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html b/ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html
new file mode 100644
index 0000000..8d3ff6b
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html
@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('涉密人员培训详情')" />
+    <th:block th:include="include :: jsonview-css" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+    <form class="form-horizontal m" id="form-train-edit" th:object="${tdTrain}">
+        <input name="ID" th:field="*{ID}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">所属地市：</label>
+            <div class="col-sm-8">
+                <select id="City" name="AREAID" disabled required @change="getAreaList()" v-model="City" class="form-control m-b">
+                    <option value="">请选择</option>
+                    <option v-for="option in CityList" :value="option.id" :key="option.id">
+                        {{ option.name }}
+                    </option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">所属区县：</label>
+            <div class="col-sm-8">
+                <select id="Area" name="FRAMEWORK" disabled v-model="Area" class="form-control m-b">
+                    <option value="">请选择</option>
+                    <option v-for="option in AreaList" :value="option.id" :key="option.id">
+                        {{ option.name }}
+                    </option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">人员名称：</label>
+            <div class="col-sm-8">
+                <input name="USERNAME" disabled th:field="*{USERNAME}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">单位名称：</label>
+            <div class="col-sm-8">
+                <input name="deptName" disabled th:field="*{deptName}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">培训类型：</label>
+            <div class="col-sm-8">
+                <select name="trainType" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainType}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">培训对象：</label>
+            <div class="col-sm-8">
+                <select name="trainSubject" disabled class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainSubject}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">培训地点：</label>
+            <div class="col-sm-8">
+                <textarea name="trainAddress" disabled class="form-control">[[*{trainAddress}]]</textarea>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">培训开始日期：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="trainDate" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">培训人员：</label>
+            <div class="col-sm-8">
+                <input name="trainName" disabled th:field="*{trainName}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">培训结束时间：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="trainTimeend" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">培训状态：</label>
+            <div class="col-sm-8">
+                <select name="trainState" disabled required class="form-control m-b" th:with="type=${@dict.getType('sys_examine_state')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainState}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">审核人员：</label>
+            <div class="col-sm-8">
+                <input name="updateStaffid" disabled th:field="*{updateStaffid}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">培训评价：</label>
+            <div class="col-sm-8">
+                <textarea name="TRAININFO" disabled class="form-control">[[*{TRAININFO}]]</textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: jsonview-js" />
+<th:block th:include="include :: datetimepicker-css" />
+<script th:inline="javascript">
+    var trainStateDatas = [[${@dict.getType('sys_examine_state')}]];
+    var trainStateText = $("input[name='trainState']").val()
+    trainStateDatas.forEach((item)=>{
+        if(trainStateText === item.dictValue){
+            $("input[name='trainState']").val(item.dictLabel);
+        }
+    })
+    var app = new Vue({
+        el: '#app',
+        data: {
+            CityList: [],
+            AreaList:[],
+            City:[[${tdTrain.AREAID}]],
+            Area:[[${tdTrain.FRAMEWORK}]],
+            params:{
+                parentId:'',
+            }
+        },
+        mounted(){
+            // 初始化地市列表
+            this.getCityList();
+            if (this.City){
+                this.getAreaList()
+            }
+        },
+        methods:{
+            getCityList(){
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params ,
+                    success:((res)=>{
+                        this.CityList = res.data
+                    }) ,
+                });
+            },
+            getAreaList(){
+                this.params.parentId = this.City
+                $.ajax({
+                    url: ctx + "system/area/getSysAreaList",
+                    type: 'GET',
+                    data:this.params,
+                    success:((res)=>{
+                        this.AreaList = res.data
+                    }) ,
+                });
+            }
+        }
+    })
+
+    $("input[name='trainDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='createDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='updateDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='trainTimeend']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html b/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html
index bde5487..a1f9cf8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html
@@ -51,11 +51,12 @@
 </div>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
-    var detailFlag = [[${@permission.hasPermi('system:trainnum:print')}]];
+    var detailFlag = [[${@permission.hasPermi('system:trainnum:detail')}]];
+    var listFlag = [[${@permission.hasPermi('system:trainnum:list')}]];
     var trainTypeDatas = [[${@dict.getType('sys_usertrain_typer')}]];
     var trainSubjectDatas = [[${@dict.getType('sys_usertrain_obj')}]];
     var trainStateDatas = [[${@dict.getType('sys_examine_state')}]];
-    var prefix = ctx + "system/train";
+    var prefix = ctx + "system/trainnum";
 
     $(function() {
         var options = {