From eed29fef1f4ee17ca33f3f65c16be9d73aea977b Mon Sep 17 00:00:00 2001 From: wangzemei Date: Thu, 15 Sep 2022 09:02:32 +0000 Subject: [PATCH] * modify judge --- module/story/model.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index 98a4bc47c0..6bfdde65fc 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4255,28 +4255,26 @@ class storyModel extends model $title = $story->status == 'changing' ? $this->lang->story->recallChange : $this->lang->story->recall; $title = $isClick ? $title : $this->lang->story->recallTip['actived']; - $storyPriv = array(common::hasPriv('story', 'processStoryChange'), common::hasPriv('story', 'change'), common::hasPriv('story', 'submitReview'), common::hasPriv('story', 'review'), common::hasPriv('story', 'close')); + $storyPriv = array(common::hasPriv('story', 'processStoryChange'), common::hasPriv('story', 'change'), common::hasPriv('story', 'submitReview'), common::hasPriv('story', 'review'), common::hasPriv('story', 'close')); $storyPrivCount = 0; - foreach($storyPriv as $value){ - if($value == 1){ - $storyPrivCount ++; - } + foreach($storyPriv as $value) + { + if($value == 1) $storyPrivCount ++; } if(common::hasPriv('story', 'recall') && ($storyPrivCount > 1)) { $menu .= "
"; $menu .= ""; $menu .= ""; $menu .= "
"; } else { - $menu .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title); + $menu .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title); } $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true); - if((common::hasPriv('story', 'processStoryChange') || common::hasPriv('story', 'change') || common::hasPriv('story', 'submitReview') || common::hasPriv('story', 'review') || common::hasPriv('story', 'close')) && - (common::hasPriv('story', 'edit') || common::hasPriv('story', 'createCase') || common::hasPriv('story', 'batchCreate') || common::hasPriv('projectstory', 'unlinkStory'))) + if((common::hasPriv('story', 'recall') or $storyPrivCount > 0) and (common::hasPriv('story', 'edit') or common::hasPriv('story', 'createCase') or common::hasPriv('story', 'batchCreate') or common::hasPriv('projectstory', 'unlinkStory'))) { $menu .= "
"; }