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

Merge branch 'develop' into feature/mzl_dev_xd

Browse Source
This commit is contained in:
mzl
2025-07-25 13:40:05 +08:00
parent 2b052ec2b4 be87fce09b
commit 76ed61a95d
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/crm/controller/CustomerController.php
+7 -4
View File
@@ -2,6 +2,7 @@
namespace app\crm\controller; namespace app\crm\controller;
use app\common\model\Corp;
use app\common\model\User; use app\common\model\User;
use app\crm\model\Channel; use app\crm\model\Channel;
use app\crm\model\Country; use app\crm\model\Country;
@@ -124,8 +125,8 @@ class CustomerController extends BaseController
{ {
$userId = $request->user->uid; $userId = $request->user->uid;
$filter = Util::getParam($request, 'filter'); $filter = Util::getParam($request, 'filter');
$page = $request->input('page', 1); $page = $request->input('current', 1);
$perPage = $request->input('per_page', 10); $perPage = $request->input('size', 10);
$where = [ $where = [
['user_id', '=', $userId], ['user_id', '=', $userId],
['corp_abbr', '=', $request->basic_data['corp_abbr']], ['corp_abbr', '=', $request->basic_data['corp_abbr']],
@@ -249,13 +250,15 @@ class CustomerController extends BaseController
return $this->error(trans('contacts_not_null')); return $this->error(trans('contacts_not_null'));
} }
$corpInfo = Corp::where('abbr', $request->basic_data['corp_abbr'])->first();
$corpId = $corpInfo->id;
$data = [ $data = [
'user_id' => $request->user->uid, 'user_id' => $request->user->uid,
'corp_abbr' => $request->basic_data['corp_abbr'], 'corp_abbr' => $corpId,
'grade' => Util::getParam($request, 'grade', 0), 'grade' => Util::getParam($request, 'grade', 0),
'channel_id' => $channel_id, 'channel_id' => $channel_id,
'country_id' => $country_id, 'country_id' => $country_id,
'car_type_id' => $car_type_id, // 'car_type_id' => $car_type_id,
'magnitude' => Util::getParam($request, 'magnitude', 0), 'magnitude' => Util::getParam($request, 'magnitude', 0),
'email' => $email, 'email' => $email,
'phone' => $phone, 'phone' => $phone,
app/crm/controller/FollowController.php
+4 -1
View File
@@ -2,6 +2,7 @@
namespace app\crm\controller; namespace app\crm\controller;
use app\common\model\Corp;
use app\crm\model\Customer; use app\crm\model\Customer;
use app\crm\model\Follow; use app\crm\model\Follow;
use app\crm\service\CustomerService; use app\crm\service\CustomerService;
@@ -96,9 +97,11 @@ class FollowController extends BaseController
return $this->error(trans('picture_not_null')); return $this->error(trans('picture_not_null'));
} }
$corpInfo = Corp::where('abbr', $request->basic_data['corp_abbr'])->first();
$corpId = $corpInfo->id;
$data = [ $data = [
'user_id' => $request->user->uid, 'user_id' => $request->user->uid,
'corp_abbr' => $request->basic_data['corp_abbr'], 'corp_abbr' => $corpId,
'customer_id' => $customer_id, 'customer_id' => $customer_id,
'type' => $type, 'type' => $type,
'picture' => $picture, 'picture' => $picture,