|
|
@@ -54,6 +54,12 @@ class Couple extends AdminBaseController
|
|
|
$old_people_by_company[$v['company']] = $v['people'];
|
|
|
}
|
|
|
|
|
|
+ //新名单重整
|
|
|
+ $new_people_by_mobile = [];
|
|
|
+ foreach ($new_list as $v) {
|
|
|
+ $new_people_by_mobile[$v['mobile']] = $v['company'];
|
|
|
+ }
|
|
|
+
|
|
|
//匹配名单
|
|
|
$res = [];
|
|
|
foreach ($delete as $k => $v) {
|
|
|
@@ -65,8 +71,10 @@ class Couple extends AdminBaseController
|
|
|
foreach ($add as $k => $v) {
|
|
|
$item = $new_list[$k];
|
|
|
$item['status'] = '新增';
|
|
|
- $item['people'] = $old_people_by_company[$v['company']] ?? '';
|
|
|
- $res[] = $item;
|
|
|
+ if (!empty($new_people_by_mobile[$v]) && !empty($old_people_by_company[$new_people_by_mobile[$v]])) {
|
|
|
+ $item['people'] = $old_people_by_company[$new_people_by_mobile[$v]];
|
|
|
+ }
|
|
|
+ $res[] = $item;
|
|
|
}
|
|
|
|
|
|
foreach ($list as $k => $v) {
|
