Merge branch 'feature/group_type' into dev

Application/Admin/Controller/PromoteController.class.php

@@ -1369,6 +1369,9 @@ class PromoteController extends ThinkController
     public function belong_add($promote_id=null, $company_belong = null, $company_relation = null, $remark = null)
     {
         if (IS_POST) {
+            if (empty($promote_id)) {
+                $this->error('请选择会长');
+            }
             $data = array(
                 'promote_id' => $promote_id,
                 'company_belong' => $company_belong,
@@ -1402,6 +1405,9 @@ class PromoteController extends ThinkController
     public function belong_edit($promote_id=null, $company_belong = null, $company_relation = null, $remark = null)
     {
         if (IS_POST) {
+            if (empty($promote_id)) {
+                $this->error('请选择会长');
+            }
             $data = array(
                 'promote_id' => $promote_id,
                 'company_belong' => $company_belong,

Application/Admin/Controller/PublicController.class.php

@@ -92,6 +92,7 @@ class PublicController extends \Think\Controller
                     'mobile_phone'   => $promote['mobile_phone'],
                     'nickname'  => $promote['nickname'],
                     'username'  => $promote['nickname'] ?: $promote['account'],
+                    'company_id'  => $promote['company_id'],
                 );
                 $session_name = 'cp_user_auth';
                 if (I('auto_login')) {
@@ -111,6 +112,7 @@ class PublicController extends \Think\Controller
                         'account'   => $partner['link_phone'],
                         'mobile_phone' => $partner['link_phone'],
                         'nickname'  => $partner['link_man'],
+                        'company_id'  => $partner['id'],
                         'username'  => $partner['link_man'] ?: $partner['account'],
                     );
                     $session_name = 'cp_user_auth';

Application/Admin/Controller/VerifyBillController.class.php

@@ -32,7 +32,10 @@ class VerifyBillController extends Controller {
      */
     public function index(){
         $m_title = '对账单管理';
-        $list_data = DM('statement')->order('create_time desc')->select();
+        $list_data = DM('statement')
+            ->where(['company_id' => session('cp_user_auth.company_id')])
+            ->order('create_time desc')
+            ->select();
         foreach ($list_data as $key => $value) {
             $list_data[$key]['statement_type_str'] = $value['statement_type'] ? '工会对账单' : 'cp对账单';
         }