xinyouhe/crm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	app/controller/CustomerController.php
This commit is contained in:
HESU\HESU
2025-04-01 11:15:10 +08:00
parent 2cf5eacfe7 64d294f3c8
commit 3d68efed14
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controller/CustomerController.php
+2
View File
@@ -140,6 +140,7 @@ class CustomerController
if (Util::isEmpty($userId)) { if (Util::isEmpty($userId)) {
return Util::fail(['user_id' => $userId], trans('user_none')); return Util::fail(['user_id' => $userId], trans('user_none'));
} }
$where[] = ['type', 0];
if($seas == 'seas'){ if($seas == 'seas'){
$where[] = ['user_id', 0]; $where[] = ['user_id', 0];
}else{ }else{
@@ -586,6 +587,7 @@ class CustomerController
[ [
'user_sn' => $user_sn, 'user_sn' => $user_sn,
'uid' => $uid, 'uid' => $uid,
'type' => 0,
'channel_id' => $channel_id, 'channel_id' => $channel_id,
'country_id' => $country_id, 'country_id' => $country_id,
'magnitude' => $magnitude, 'magnitude' => $magnitude,