|
|
@@ -136,8 +136,8 @@ class CommonController extends BaseController
|
|
|
foreach ($data as $user) {
|
|
|
if (isset($deptMap[$user['dept_id']])) {
|
|
|
$deptMap[$user['dept_id']]['users'][] = [
|
|
|
- 'value' => $user['value'],
|
|
|
- 'label' => $user['label'],
|
|
|
+ 'id' => $user['value'],
|
|
|
+ 'name' => $user['label'],
|
|
|
];
|
|
|
}
|
|
|
}
|
|
|
@@ -158,8 +158,8 @@ class CommonController extends BaseController
|
|
|
$result = [];
|
|
|
foreach ($depts as $dept) {
|
|
|
$item = [
|
|
|
- 'value' => $dept['id'],
|
|
|
- 'label' => $dept['name'],
|
|
|
+ 'id' => 'dept_id_'.$dept['id'],
|
|
|
+ 'name' => $dept['name'],
|
|
|
];
|
|
|
// 先加用户
|
|
|
if (!empty($dept['users'])) {
|