Merge branch 'develop'

# Conflicts: # app/crm/controller/CustomerController.php # app/crm/service/CustomerService.php
2025-07-30 11:51:16 +08:00
parent c641b5cb1f 0bd4a56de2
commit 63cc2b8a7e
2 changed files with 4 additions and 0 deletions
@@ -272,6 +272,7 @@ class CustomerController extends BaseController
        ];

        if (Util::isEmpty($id)) {
+            $data['enter_user_id'] = $request->user->uid;
            $res = Customer::create($data);
        } else {
            unset($data['grade']);
@@ -2,6 +2,7 @@

 namespace app\crm\service;

+use app\common\model\User;
 use app\crm\logic\CustomerLogic;
 use app\crm\model\CarType;
 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['last_follow'] = $last_follow;

+        $customer['enter_user_name'] = empty($customer['enter_user_id']) ? '' : User::where('id',$customer['enter_user_id'])->value('name');
+
        if ($tag) {
            foreach ($customer['tags'] as &$tag) {
                $tag['names'] = unserialize($tag['names']);