From 3ccbb16941090b426551081dac8a1ef6d9bfe9f1 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 4 Aug 2021 10:46:31 +0800 Subject: [PATCH] * finish task #40919. --- module/story/model.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/story/model.php b/module/story/model.php index 4c250bf3e5..84cebc4e6b 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2677,6 +2677,8 @@ class storyModel extends model ->where('deleted')->eq(0) ->andWhere('parent')->le(0) ->andWhere('type')->eq('story') + ->andWhere('stage')->eq('wait') + ->andWhere('plan')->in('0,') ->andWhere('status')->notin('closed,draft') ->andWhere('product')->eq($productID) ->beginIF($append)->orWhere('id')->in($append)->fi() @@ -3361,7 +3363,7 @@ class storyModel extends model if($action == 'createcase') return $story->type != 'requirement'; if($action == 'batchcreate' and $story->parent > 0) return false; if($action == 'batchcreate' and $story->type == 'requirement' and $story->status != 'closed') return $story->status != 'draft'; - if($action == 'batchcreate' and ($story->status != 'active' or $story->stage != 'wait')) return false; + if($action == 'batchcreate' and ($story->status != 'active' or $story->stage != 'wait' or !empty($story->plan))) return false; return true; }