Merge branch 'release' into dev

5 years ago · 69e4c3fbd7
parent 8652c19f5c 9105b75ddf
commit 69e4c3fbd7
2 changed files with 5 additions and 2 deletions
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@ -930,7 +930,7 @@ class PromoteService {
            'real_name'     => $params['real_name'],
            'email'         => $params['email'],
            'idcard'        => $params['idcard'] ?? '',
-            'status'        => $params['status'],
+            'status'        => $params['status'] ?? 0,
            'mobile_phone'  => $params['mobile_phone'],
            'bank_name'     => $params['bank_name'] ?? '',
            'bank_card'     => $params['bank_card'],
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@ -985,6 +985,9 @@ class PromoteController extends BaseController
            } else {
                $parent = $loginPromote;
            }
+            if ($parent) {
+                $params['company_id'] = $parent['company_id'];
+            }
            if (C('PROMOTE_AUTO_AUDIT') == 1) {
                $params['status'] = 1;
            }