xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/crmAdmin0717' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-07-30 10:15:24 +08:00
parent caa04809a9 68bbdc0fba
commit 67d58d6170
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/crm/controller/CustomerController.php
+1
View File
@@ -272,6 +272,7 @@ class CustomerController extends BaseController
]; ];
if (Util::isEmpty($id)) { if (Util::isEmpty($id)) {
$data['enter_user_id'] = $request->user->uid;
$res = Customer::create($data); $res = Customer::create($data);
} else { } else {
unset($data['grade']); unset($data['grade']);
app/crm/service/CustomerService.php
+3
View File
@@ -2,6 +2,7 @@
namespace app\crm\service; namespace app\crm\service;
use app\common\model\User;
use app\crm\logic\CustomerLogic; use app\crm\logic\CustomerLogic;
use app\crm\model\CarType; use app\crm\model\CarType;
use app\crm\model\Channel; use app\crm\model\Channel;
@@ -145,6 +146,8 @@ class CustomerService
$customer['channel_name'] = empty($customer['channel_id'])?'':Channel::where(['id'=>$customer['channel_id']])->value($nameLang); $customer['channel_name'] = empty($customer['channel_id'])?'':Channel::where(['id'=>$customer['channel_id']])->value($nameLang);
// $customer['last_follow'] = $last_follow; // $customer['last_follow'] = $last_follow;
$customer['enter_user_name'] = empty($customer['enter_user_id']) ? '' : User::find($customer['enter_user_id'])->value('name');
if ($tag) { if ($tag) {
foreach ($customer['tags'] as &$tag) { foreach ($customer['tags'] as &$tag) {
$tag['names'] = unserialize($tag['names']); $tag['names'] = unserialize($tag['names']);