From b74b6c584e67e4a90390746b3665ac8ea6f930e2 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Thu, 30 May 2024 15:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/system/exam/TdUserExamController.java  | 2 ++
 .../system/property/TdPropertyChangeController.java       | 4 ++--
 .../templates/system/network/netinfo/netinfo.html         | 8 ++++----
 .../templates/system/property/data/propertyinfo.html      | 6 +++---
 .../src/main/resources/templates/system/train/train.html  | 2 +-
 .../resources/templates/system/trainnum/trainnum.html     | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdUserExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdUserExamController.java
index 06cd602..502eefb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdUserExamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/exam/TdUserExamController.java
@@ -29,4 +29,6 @@ public class TdUserExamController extends BaseController {
 
     }
 
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java
index 6937ef9..8d858ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeController.java
@@ -69,7 +69,7 @@ public class TdPropertyChangeController extends BaseController {
     /**
      * 涉密资产报废
      */
-    @RequiresPermissions("system:changeproperty:change")
+    @RequiresPermissions("system:changeproperty:destory")
     @GetMapping("/destory/{id}")
     public String destory(@PathVariable("id") String id, ModelMap mmap)
     {
@@ -81,7 +81,7 @@ public class TdPropertyChangeController extends BaseController {
     /**
      * 保存变更修改
      */
-    @RequiresPermissions("system:changeproperty:change")
+    @RequiresPermissions("system:changeproperty:destory")
     @Log(title = "资产变更", businessType = BusinessType.UPDATE)
     @PostMapping("/destory")
     @ResponseBody
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html
index bd28a32..9e4fd56 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html
@@ -39,16 +39,16 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="hanldAdd()" shiro:hasPermission="system:netinfo:add">
+                <a class="btn btn-success" onclick="hanldAdd()" shiro:hasPermission="system:network:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:netinfo:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:network:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:netinfo:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:network:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:netinfo:export">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:network:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
                 <a class="btn btn-danger" onclick="closeItem()">
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
index be82b87..45e7618 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
@@ -39,13 +39,13 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="hanldAdd()" shiro:hasPermission="system:propertyinfo:add">
+                <a class="btn btn-success" onclick="hanldAdd()" shiro:hasPermission="system:property:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:propertyinfo:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:property:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:propertyinfo:export">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:property:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
                 <a class="btn btn-danger" onclick="closeItem()">
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/train.html b/ruoyi-admin/src/main/resources/templates/system/train/train.html
index f4b3f2e..084a437 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/train.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/train.html
@@ -60,7 +60,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var detailFlag = [[${@permission.hasPermi('monitor:train:detail')}]];
+        var detailFlag = [[${@permission.hasPermi('system:train:detail')}]];
         var editFlag = [[${@permission.hasPermi('system:train:edit')}]];
         var examineFlag = [[${@permission.hasPermi('system:train:examine')}]];
         var removeFlag = [[${@permission.hasPermi('system:train:remove')}]];
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 592f75a..bde5487 100644
--- a/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html
@@ -51,7 +51,7 @@
 </div>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
-    var detailFlag = [[${@permission.hasPermi('monitor:train:detail')}]];
+    var detailFlag = [[${@permission.hasPermi('system:trainnum:print')}]];
     var trainTypeDatas = [[${@dict.getType('sys_usertrain_typer')}]];
     var trainSubjectDatas = [[${@dict.getType('sys_usertrain_obj')}]];
     var trainStateDatas = [[${@dict.getType('sys_examine_state')}]];