From e8f77ac6329a0002d1d39d3c2b880f35c43bb351 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 18 Nov 2021 11:10:02 +0800
Subject: [PATCH] * Modify logic.

---
 module/execution/control.php          |  5 +----
 module/execution/view/create.html.php | 10 +++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 49ff183f3c..1b3fcd99a8 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1398,10 +1398,7 @@ class execution extends control
         $this->view->qdUsers             = $qdUsers;
         $this->view->rdUsers             = $rdUsers;
         $this->view->users               = $this->loadModel('user')->getPairs('nodeleted|noclosed');
-        $this->view->PO                  = isset($copyExecution->PO) ? $copyExecution->PO : '';
-        $this->view->QD                  = isset($copyExecution->QD) ? $copyExecution->QD : '';
-        $this->view->PM                  = isset($copyExecution->PM) ? $copyExecution->PM : '';
-        $this->view->RD                  = isset($copyExecution->RD) ? $copyExecution->RD : '';
+        $this->view->copyExecution       = isset($copyExecution) ? $copyExecution : array();
         $this->view->from                = $this->app->tab;
         $this->display();
     }
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 065e19c1d0..95d89b9a96 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -105,7 +105,7 @@
             <div class='row'>
               <?php $i = 0;?>
               <?php foreach($products as $product):?>
-              <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
+              <?php $hasBranch = ($product->type != 'normal' and isset($branchGroups[$product->id]));?>
               <?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
               <div class='col-sm-4'>
                 <div class="input-group<?php if($hasBranch) echo ' has-branch';?>">
@@ -163,13 +163,13 @@
           <td>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo $lang->execution->PO;?></span>
-              <?php echo html::select('PO', $poUsers, $PO, "class='form-control chosen'");?>
+              <?php echo html::select('PO', $poUsers, isset($copyExecution->PO) ? $copyExecution->PO : '', "class='form-control chosen'");?>
             </div>
           </td>
           <td>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo $lang->execution->QD;?></span>
-              <?php echo html::select('QD', $qdUsers, $QD, "class='form-control chosen'");?>
+              <?php echo html::select('QD', $qdUsers, isset($copyExecution->QD) ? $copyExecution->QD : '', "class='form-control chosen'");?>
             </div>
           </td>
         </tr>
@@ -177,13 +177,13 @@
           <td>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo $lang->execution->PM;?></span>
-              <?php echo html::select('PM', $pmUsers, $PM, "class='form-control chosen'");?>
+              <?php echo html::select('PM', $pmUsers, isset($copyExecution->PM) ? $copyExecution->PM : '', "class='form-control chosen'");?>
             </div>
           </td>
           <td>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo $lang->execution->RD;?></span>
-              <?php echo html::select('RD', $rdUsers, $RD, "class='form-control chosen'");?>
+              <?php echo html::select('RD', $rdUsers, isset($copyExecution->RD) ? $copyExecution->RD : '', "class='form-control chosen'");?>
             </div>
           </td>
         </tr>