From 88ea30e46deb06a152538fc0e54ad000263e9b28 Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Fri, 19 Nov 2021 15:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=AF=E8=A7=81=E6=80=A7?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_list.ftl          | 27 ++++++-------------
 .../admin/project_select_role_user.ftl        | 11 ++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 778b008..6a3584a 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -3,17 +3,7 @@
 
 <@defaultLayout.layout>
     <link rel="stylesheet" href="../assets/css/amazeui.switch.css"/>
-    <style>
-        ul.ztree {
-            margin-top: 10px;
-            border: 1px solid #617775;
-            background: #f0f6e4;
-            width:220px;
-            height:360px;
-            overflow-y:scroll;
-            overflow-x:auto;
-        }
-    </style>
+
     <div class="admin-content">
         <div class="am-cf am-padding" style="padding:1rem 1.6rem 1.6rem 1rem;margin:0px;">
             <!--  padding:1px 2px 3px 4px;上、右、下,和左   -->
@@ -196,7 +186,7 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <#list    pager.list as list>
+                        <#list pager.list as list>
                             <tr>
                                 <td>${list.id!}</td>
                                 <td>${list.name!}</td>
@@ -211,10 +201,12 @@
                                 <td>
                                     <div class="am-btn-toolbar">
                                         <div class="am-btn-group am-btn-group-xs">
-                                            <button type="button"
-                                                    class="am-btn am-btn-default am-btn-xs am-text-secondary"
-                                                    onclick="location.href='${base}/project/selectRoleUser?projectId=${list.id}'"><span class="am-icon-pencil-square-o"></span>设置项目可见性
-                                            </button>
+                                            <#if list.creatorId==adminId>
+                                                <button type="button"
+                                                        class="am-btn am-btn-default am-btn-xs am-text-secondary"
+                                                        onclick="location.href='${base}/project/selectRoleUser?projectId=${list.id}'"><span class="am-icon-pencil-square-o"></span>设置项目可见性
+                                                </button>
+                                            </#if>
                                         <#--<@shiro.hasPermission name="PROJECT_EDIT">-->
                                         <#--概算状态 并且概算审批状态为草稿和不通过-->
                                             <#if list.status==1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)>
@@ -344,9 +336,6 @@
 </@defaultLayout.layout>
 <script src="../assets/js/amazeui.switch.js"></script>
 <script src="${base}/assets/js/project_common.js"></script>
-<script type="text/javascript" src="${base}/ztree/js/jquery.ztree.core.js"></script>
-<script type="text/javascript" src="${base}/ztree/js/jquery.ztree.excheck.js"></script>
-<script type="text/javascript" src="${base}/ztree/js/jquery.ztree.exedit.js"></script>
 <script type="text/javascript">
     $(function () {
 
diff --git a/src/main/resources/templates/admin/project_select_role_user.ftl b/src/main/resources/templates/admin/project_select_role_user.ftl
index 7160078..edc964f 100644
--- a/src/main/resources/templates/admin/project_select_role_user.ftl
+++ b/src/main/resources/templates/admin/project_select_role_user.ftl
@@ -2,6 +2,17 @@
 <#import "../common/defaultLayout.ftl" as defaultLayout>
 <@defaultLayout.layout>
 <link rel="stylesheet" href="${base}/ztree/css/zTreeStyle/zTreeStyle.css" type="text/css">
+<style>
+    /*ul.ztree {
+        margin-top: 10px;
+        border: 1px solid #617775;
+        background: #f0f6e4;
+        width:220px;
+        height:360px;
+        overflow-y:scroll;
+        overflow-x:auto;
+    }*/
+</style>
 <div class="admin-content">
     <div class="admin-content-body">
         <div class="am-cf am-padding">