From aa4e7d6fc2f5325f280a8221c362f882c6d63b8e Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@chandao.com>
Date: Tue, 11 Nov 2025 03:50:25 +0000
Subject: [PATCH]  * [story#78250,done,0.5h] finish story.

---
 module/custom/config.php           | 4 ++--
 module/custom/model.php            | 2 +-
 module/custom/ui/required.html.php | 1 +
 module/user/ui/create.html.php     | 1 +
 module/user/ui/edit.html.php       | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/custom/config.php b/module/custom/config.php
index 4ab69bd512..194ff38876 100644
--- a/module/custom/config.php
+++ b/module/custom/config.php
@@ -78,8 +78,8 @@ $config->custom->fieldList['testcase']['createcase'] = 'lib,stage,pri,preconditi
 $config->custom->fieldList['testreport']             = 'begin,end,members,report';
 $config->custom->fieldList['testtask']               = 'owner,pri,desc';
 $config->custom->fieldList['doc']                    = 'keywords,content';
-$config->custom->fieldList['user']['create']         = 'dept,role,email,commiter';
-$config->custom->fieldList['user']['edit']           = 'dept,role,email,commiter,skype,qq,mobile,phone,address,zipcode,dingding,slack,whatsapp,weixin';
+$config->custom->fieldList['user']['create']         = 'dept,role,group,email,commiter';
+$config->custom->fieldList['user']['edit']           = 'dept,role,group,email,commiter,skype,qq,mobile,phone,address,zipcode,dingding,slack,whatsapp,weixin';
 
 if(!empty($config->setCode))
 {
diff --git a/module/custom/model.php b/module/custom/model.php
index 808beaef9f..2442ca93db 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -579,7 +579,7 @@ class customModel extends model
             if($moduleName == 'user' && $method == 'edit') $this->app->loadConfig('user');
             foreach(explode(',', $fieldList) as $fieldName)
             {
-                if($moduleName == 'user' && $method == 'edit' && strpos($this->config->user->contactField, $fieldName) === false) continue;
+                if($moduleName == 'user' && $method == 'edit' && strpos($this->config->user->contactField, $fieldName) === false && !in_array($fieldName, array('dept', 'role', 'group', 'email', 'commiter'))) continue;
                 if($moduleName == 'project' && $fieldName == 'budget' && $this->config->vision == 'lite') continue;
                 if($fieldName == 'comment') $fields[$fieldName] = $this->lang->comment;
                 if(isset($moduleLang->{$fieldName}) && is_string($moduleLang->{$fieldName})) $fields[$fieldName] = $moduleLang->$fieldName;
diff --git a/module/custom/ui/required.html.php b/module/custom/ui/required.html.php
index 10aabb2d33..4779c645f5 100644
--- a/module/custom/ui/required.html.php
+++ b/module/custom/ui/required.html.php
@@ -15,6 +15,7 @@ $i            = 0;
 foreach($requiredFields as $method => $requiredField)
 {
     $fields = $this->custom->getFormFields($module, $method);
+
     if(empty($fields)) continue;
     if($module == 'caselib' and $method == 'createcase') continue;
 
diff --git a/module/user/ui/create.html.php b/module/user/ui/create.html.php
index fc1b9b9dc1..7ddab1d9e8 100644
--- a/module/user/ui/create.html.php
+++ b/module/user/ui/create.html.php
@@ -172,6 +172,7 @@ formPanel
             set::control(array("control" => "picker","multiple" => true)),
             set::name('group[]'),
             set::items($groupList),
+            set::required(strpos($this->config->user->create->requiredFields, 'group') !== false),
             set::placeholder($lang->user->placeholder->group)
         )
     ) : null,
diff --git a/module/user/ui/edit.html.php b/module/user/ui/edit.html.php
index 5d52421801..4e42fdf56d 100644
--- a/module/user/ui/edit.html.php
+++ b/module/user/ui/edit.html.php
@@ -97,6 +97,7 @@ formPanel
         (
             set::width('1/2'),
             set::label($lang->user->group),
+            set::required(strpos($this->config->user->edit->requiredFields, 'group') !== false),
             picker
             (
                 set::name('group[]'),