From 9eb36bd81f875d26146ef55b6714b271a3449149 Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Tue, 22 Oct 2019 10:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E9=95=BF=E8=B4=A6=E5=8F=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/TestResourceController.class.php        | 2 +-
 Application/Home/View/default/Public/promote_base.html      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php
index 55be6005b..e34d57fcf 100644
--- a/Application/Home/Controller/TestResourceController.class.php
+++ b/Application/Home/Controller/TestResourceController.class.php
@@ -246,7 +246,7 @@ class TestResourceController extends BaseController
         parent::_initialize();
         $map['id'] = get_pid();
         $pro = M("promote", "tab_")->where($map)->find();
-        if ($pro['parent_id']!=0) {
+        if ($pro['parent_id']!=0&&!($pro['parent_id']>0&&$pro['grand_id']==0)) {
             $this->error('无权操作！');
         }
     }
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index edbb370ae..55c34891c 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -88,8 +88,8 @@
 				<?php endif;?>
 			</div>
 
-			<?php if($loginer['id'] == 1 || $loginer['parent_id'] == 1 || $loginer['grand_id'] == 1):?>
-			<eq name="parent_id" value="0">
+			<?php if($loginer['id'] == 1 || $loginer['parent_id'] == 1 || $loginer['grand_id'] == 1 || ($loginer['parent_id']>0&&$loginer['grand_id']==0) ):?>
+
 				<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>测试资源</span><i class="arrow_icon"></i></div>
 				<div class="navContent jsnavContent">
 					<a href="{:U('TestResource/index')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">测试资源申请</a>
@@ -97,7 +97,7 @@
 					<a href="{:U('TestResource/supportNumberList')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq supportNumberList or ACTION_NAME eq freezeSupport or ACTION_NAME eq unfreezeSupport or ACTION_NAME eq rechangePassward ) '>active</if> ">扶持号管理</a>
 					<a href="{:U('TestResource/protectLogList')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq protectLogList '>active</if> ">日志管理</a>
 				</div>
-			</eq>
+
 			<?php endif;?>
 			<!--<eq name="parent_id" value="0">
       <div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>扶持管理</span><i class="arrow_icon"></i></div>