From 2337e464bde8a62b27ac2a26e7e762ceae5de58d Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Mon, 8 Nov 2021 16:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E6=88=91=E5=AE=A1=E6=A0=B8=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_list.ftl       | 8 +++++++-
 .../resources/templates/admin/project_list_approve.ftl    | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 6da4777..4198dd3 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -154,6 +154,12 @@
                                 <span class="am-icon-plus"></span> 新增
                             </button>
                         </@shiro.hasPermission>
+                        <@shiro.hasPermission name="PROJECT_APPROVE">
+                            <button type="button" class="am-btn am-btn-default"
+                                    onclick="location.href='${base}/project/listApprove'">
+                                <span class="am-icon-plus"></span> 待我审核的项目
+                            </button>
+                        </@shiro.hasPermission>
                     </div>
                 </div>
             </div>
@@ -190,7 +196,7 @@
                                 <td>${list.creatorName!}</td>
                                 <td>${list.deptName!}</td>
                                 <td>${list.startDate?string("yyyy-MM")} ~ ${list.endDate?string("yyyy-MM")}</td>
-                                <td>${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")} ~ ${list.endDate?string("yyyy-MM-dd HH:mm:ss")}</td>
+                                <td>${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")}</td>
                                 <td>
                                     <div class="am-btn-toolbar">
                                         <div class="am-btn-group am-btn-group-xs">
diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl
index d1d726f..48f520c 100644
--- a/src/main/resources/templates/admin/project_list_approve.ftl
+++ b/src/main/resources/templates/admin/project_list_approve.ftl
@@ -128,12 +128,12 @@
                         <tr>
                             <td colspan="4">
                                 <div align='right'>
-                                    <@shiro.hasPermission name="PROJECT_QUERY">
+                                    <@shiro.hasPermission name="APPROVE_QUERY">
                                     <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
                                             id="submit-btn">搜索
                                     </button>
                                     </@shiro.hasPermission>
-                                    <@shiro.hasPermission name="PROJECT_EXPORT">
+                                    <@shiro.hasPermission name="APPROVE_EXPORT">
                                     <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
                                             id="submit-btn-export">导出
                                     </button>
@@ -190,7 +190,7 @@
                                 <td>${list.creatorName!}</td>
                                 <td>${list.deptName!}</td>
                                 <td>${list.startDate?string("yyyy-MM")} ~ ${list.endDate?string("yyyy-MM")}</td>
-                                <td>${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")} ~ ${list.endDate?string("yyyy-MM-dd HH:mm:ss")}</td>
+                                <td>${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")}</td>
                                 <td>
                                     <div class="am-btn-toolbar">
                                         <div class="am-btn-group am-btn-group-xs">