From 47b88a959d51e6ff1fc53dab0b79c552381c30b2 Mon Sep 17 00:00:00 2001
From: Zongjun Lan <jasonlan@lucasgc.com>
Date: Fri, 25 Mar 2022 10:15:31 +0800
Subject: [PATCH] * fix bug classic user edit and batchedit

---
 module/user/view/batchcreate.html.php | 5 ++---
 module/user/view/batchedit.html.php   | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 5986cd2c9e..b24fe80460 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -84,9 +84,8 @@
           <td><?php echo html::input("account[$i]", '', "class='form-control account_$i' onchange='changeEmail($i)'");?></td>
           <td><?php echo html::input("realname[$i]", '', "class='form-control'");?></td>
           <?php if($showVisionList):?>
-            <td class="<?php echo $config->systemMode == 'new' ? 'text-left' : 'text-center';?>" style='overflow:visible'>
-              <?php if($config->systemMode == 'new')     echo html::select("visions[$i][]", $visionList, $i > 1 ? 'ditto' : (isset($visionList[$this->config->vision]) ? $this->config->vision : key($visionList)), "class='form-control chosen' multiple");?>
-              <?php if($config->systemMode == 'classic') echo $visionList['rnd'] . html::hidden("visions[$i][]", 'rnd');?>
+            <td class='text-left' style='overflow:visible'>
+              <?php echo html::select("visions[$i][]", $visionList, $i > 1 ? 'ditto' : (isset($visionList[$this->config->vision]) ? $this->config->vision : key($visionList)), "class='form-control chosen' multiple");?>
             </td>
           <?php else:?>
             <?php echo html::hidden("visions[$i][]", $this->config->vision);?>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index b522563b26..527c8e5882 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -86,8 +86,7 @@
           <td><?php echo html::input("account[$user->id]",  $user->account, "class='form-control'");?></td>
           <td><?php echo html::input("realname[$user->id]", $user->realname, "class='form-control'");?></td>
           <?php if($showVisionList):?>
-            <td class="<?php echo $config->systemMode == 'new' ? 'text-left' : 'text-center';?>"><?php echo $config->systemMode == 'new' ? html::select("visions[$user->id][]", $visionList, $user->visions, "class='form-control chosen' multiple") : $visionList['rnd'];?></td>
-            <?php if($config->systemMode == 'classic') echo html::hidden("visions[$user->id][]", 'rnd');?>
+            <td class='text-left'><?php echo html::select("visions[$user->id][]", $visionList, $user->visions, "class='form-control chosen' multiple");?></td>
           <?php else:?>
             <?php echo html::hidden("visions[$user->id][]", $this->config->vision);?>
           <?php endif;?>