Merge branch 'zjl_order_20200923'

8de4f3be · 朱继来 · c1317f7b · 91390ae0 · 8de4f3be
Commit 8de4f3be authored Oct 12, 2020 by 朱继来
Showing with 2 additions and 0 deletions
app/Model/UserCompanyModel.php
--- a/app/Model/UserCompanyModel.php
+++ b/app/Model/UserCompanyModel.php
@@ -19,6 +19,8 @@ class UserCompanyModel extends Model
    {
    	$info = $this->where('user_id', $user_id)->first();

+        if (!$info) return false;
+
    	// 公司性质
    	$company_type = Config('params.company_type');
    	$info['type_id_val'] = $company_type[$info['type_id']];