From 9f93db829ab36cbfcf0b14d2ad6221a1eb336c4d Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 3 Nov 2022 10:41:21 +0800
Subject: [PATCH 1/2] switch product fix

---
 module/story/view/create.html.php |  1 +
 module/story/view/header.html.php | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index b04c50041e..6e3f024204 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -383,6 +383,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
 <?php js::set('storyModule', $lang->story->module);?>
 <?php js::set('storyPlan', $lang->story->plan);?>
 <?php js::set('storyType', $type);?>
+<?php js::set('originProductType', !empty($branches) ? 'normal' : 'branch');?>
 <script>
 $(function(){parent.$('body.hide-modal-close').removeClass('hide-modal-close');})
 
diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php
index d323bf8bcd..94df67a275 100644
--- a/module/story/view/header.html.php
+++ b/module/story/view/header.html.php
@@ -98,8 +98,14 @@ function loadProductBranches(productID)
     {
         if(storyType == 'story')
         {
-            $('.switchBranch').toggleClass('hidden');
-            $('.switchBranch').toggleClass('disable');
+            var newProductType = data ? 'normal' : 'branch';
+            if(originProductType != newProductType)
+            {
+                $('.switchBranch').toggleClass('hidden');
+                $('.switchBranch').toggleClass('disable');
+            }
+            originProductType = newProductType;
+
             $('tr[class^="addBranchesBox"]').remove();
 
             if(data)
@@ -119,7 +125,7 @@ function loadProductBranches(productID)
                 $('#branches0').next('.picker').remove();
                 $('#branches0').chosen();
 
-                $.get(createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=story&branch=0' + '&rootModuleID=0&returnType=html&fieldID=0' + '&needManage=true&extra=&currentModuleID=0'), function(moduleData)
+                $.get(createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=story&branch=0' + '&rootModuleID=0&returnType=html&fieldID=0' + '&needManage=false&extra=&currentModuleID=0'), function(moduleData)
                 {
                     if(moduleData)
                     {
@@ -131,7 +137,7 @@ function loadProductBranches(productID)
                 });
 
                 var expired = config.currentMethod == 'create' ? 'unexpired' : '';
-                $.get(createLink('product', 'ajaxGetPlans', 'productID=' + productID + '&branch=0' + '&planID=' + $('#plan').val() + '&fieldID=0' + '&needCreate=true&expired='+ expired +'&param=skipParent,' + config.currentMethod), function(planData)
+                $.get(createLink('product', 'ajaxGetPlans', 'productID=' + productID + '&branch=0' + '&planID=' + $('#plan').val() + '&fieldID=0' + '&needCreate=false&expired='+ expired +'&param=skipParent,' + config.currentMethod), function(planData)
                 {
                     if(planData)
                     {

From 3a6b109c970c968536bafa7dcc3a2560e8661a8f Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 3 Nov 2022 14:49:12 +0800
Subject: [PATCH 2/2] fix meeting code

---
 module/story/model.php            | 1 +
 module/story/view/create.html.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 5cf8b3f3e1..68f00a9f5a 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3623,6 +3623,7 @@ class storyModel extends model
             ->andWhere('status')->notin('closed,draft')
             ->andWhere('product')->eq($productID)
             ->andWhere('plan')->in('0,')
+            ->andWhere('siblings')->eq('')
             ->beginIF($append)->orWhere('id')->in($append)->fi()
             ->fetchPairs();
         return array(0 => '') + $stories ;
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 6e3f024204..9fa2c9db47 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -88,7 +88,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
               <div class='input-group' style='display: flex;'>
                 <div class='table-col' id='branchBox'>
                   <div class='input-group'>
-                    <span class='input-group-addon fix-border'><?php echo sprintf($lang->product->branch, $lang->product->branchName[$product->type])?></span>
+                    <span class='input-group-addon'><?php echo sprintf($lang->product->branch, $lang->product->branchName[$product->type])?></span>
                     <?php echo html::select('branches[0]', $branches, $branch, "onchange='loadBranchRelation(this.value, 0);' class='form-control chosen control-branch'");?>
                   </div>
                 </div>
@@ -353,7 +353,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
         <div class='input-group' style='display: flex;'>
           <div class='table-col' id='branchBox' style='flex: 1 0 160px'>
             <div class='input-group'>
-              <span class='input-group-addon fix-border'><?php echo sprintf($lang->product->branch, $lang->product->branchName[$product->type])?></span>
+              <span class='input-group-addon'><?php echo sprintf($lang->product->branch, $lang->product->branchName[$product->type])?></span>
               <?php echo html::select("branches[$i]", $branches, $branch, "onchange='loadBranchRelation(this.value, $i);' class='form-control chosen control-branch'");?>
             </div>
           </div>