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 @@ 新增 + <@shiro.hasPermission name="PROJECT_APPROVE"> + + @@ -190,7 +196,7 @@ ${list.creatorName!} ${list.deptName!} ${list.startDate?string("yyyy-MM")} ~ ${list.endDate?string("yyyy-MM")} - ${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")} ~ ${list.endDate?string("yyyy-MM-dd HH:mm:ss")} + ${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")}
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 @@
- <@shiro.hasPermission name="PROJECT_QUERY"> + <@shiro.hasPermission name="APPROVE_QUERY"> - <@shiro.hasPermission name="PROJECT_EXPORT"> + <@shiro.hasPermission name="APPROVE_EXPORT"> @@ -190,7 +190,7 @@ ${list.creatorName!} ${list.deptName!} ${list.startDate?string("yyyy-MM")} ~ ${list.endDate?string("yyyy-MM")} - ${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")} ~ ${list.endDate?string("yyyy-MM-dd HH:mm:ss")} + ${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")}