From df43a84b281bfb29b3cb373c5d32c91ccbe32b9c Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 1 Mar 2024 13:40:47 +0800
Subject: [PATCH] * Fix bug #46356, modify passwordfield to password when batch
 creating the users.

---
 module/user/config/form.php | 50 ++++++++++++++++++-------------------
 module/user/control.php     |  5 ++++
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/module/user/config/form.php b/module/user/config/form.php
index 1a0e2b45fa..5a9132feca 100644
--- a/module/user/config/form.php
+++ b/module/user/config/form.php
@@ -23,31 +23,31 @@ $config->user->form->create['passwordLength']   = array('required' => false, 'ty
 $config->user->form->create['passwordStrength'] = array('required' => false, 'type' => 'int',    'default' => 0);
 
 $config->user->form->batchCreate = common::formConfig('user', 'batchCreate');
-$config->user->form->batchCreate['type']       = array('required' => true,  'type' => 'string', 'default' => 'inside');
-$config->user->form->batchCreate['dept']       = array('required' => false, 'type' => 'int',    'default' => 0);
-$config->user->form->batchCreate['company']    = array('required' => false, 'type' => 'int',    'default' => 0);
-$config->user->form->batchCreate['new']        = array('required' => false, 'type' => 'int',    'default' => 0);
-$config->user->form->batchCreate['newCompany'] = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['account']    = array('required' => true,  'type' => 'string', 'default' => '', 'base' => true);
-$config->user->form->batchCreate['realname']   = array('required' => true,  'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['visions']    = array('required' => true,  'type' => 'array',  'default' => [], 'filter' => 'join');
-$config->user->form->batchCreate['role']       = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['group']      = array('required' => false, 'type' => 'array',  'default' => []);
-$config->user->form->batchCreate['email']      = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['commiter']   = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['gender']     = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['password']   = array('required' => true,  'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['join']       = array('required' => false, 'type' => 'date',   'default' => null);
-$config->user->form->batchCreate['mobile']     = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['phone']      = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['qq']         = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['dingding']   = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['weixin']     = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['skype']      = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['whatsapp']   = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['slack']      = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['address']    = array('required' => false, 'type' => 'string', 'default' => '');
-$config->user->form->batchCreate['zipcode']    = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['type']          = array('required' => true,  'type' => 'string', 'default' => 'inside');
+$config->user->form->batchCreate['dept']          = array('required' => false, 'type' => 'int',    'default' => 0);
+$config->user->form->batchCreate['company']       = array('required' => false, 'type' => 'int',    'default' => 0);
+$config->user->form->batchCreate['new']           = array('required' => false, 'type' => 'int',    'default' => 0);
+$config->user->form->batchCreate['newCompany']    = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['account']       = array('required' => true,  'type' => 'string', 'default' => '', 'base' => true);
+$config->user->form->batchCreate['realname']      = array('required' => true,  'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['visions']       = array('required' => true,  'type' => 'array',  'default' => [], 'filter' => 'join');
+$config->user->form->batchCreate['role']          = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['group']         = array('required' => false, 'type' => 'array',  'default' => []);
+$config->user->form->batchCreate['email']         = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['commiter']      = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['gender']        = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['passwordfield'] = array('required' => true,  'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['join']          = array('required' => false, 'type' => 'date',   'default' => null);
+$config->user->form->batchCreate['mobile']        = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['phone']         = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['qq']            = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['dingding']      = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['weixin']        = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['skype']         = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['whatsapp']      = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['slack']         = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['address']       = array('required' => false, 'type' => 'string', 'default' => '');
+$config->user->form->batchCreate['zipcode']       = array('required' => false, 'type' => 'string', 'default' => '');
 
 $config->user->form->edit = common::formConfig('user', 'edit');
 $config->user->form->edit['type']             = array('required' => true,  'type' => 'string', 'default' => 'inside');
diff --git a/module/user/control.php b/module/user/control.php
index fb8d81111c..12d491b19e 100755
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -503,6 +503,11 @@ class user extends control
         if(!empty($_POST))
         {
             $users = form::batchData($this->config->user->form->batchCreate)->get();
+            foreach($users as $user)
+            {
+                $user->password = $user->passwordfield;
+                unset($user->passwordfield);
+            }
 
             $userIdList = $this->user->batchCreate($users, $this->post->verifyPassword);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));