商品可以价格面议 选择走访时显示输入走访企业名 分会添加活动时要总会审核 分类添加人数限制，添加活动选择了填写人数限制的分类时活动名额下显示该分类人数...

quanwei

23 hours ago a4b3ee325c7354579d495bc74a777e494e5ec38c

 admin/app/branch/model/auth/User.php

@@ -49,14 +49,14 @@
        $this->startTrans();
        try {
            // 用户是否已绑定
            $user = null;
            if($data['user_id'] > 0){
                $user = UserModel::detail($data['user_id']);
                if($user['user_type'] != 1){
                    $this->error = '该用户已绑定，或绑定的商户正在审核';
                    return false;
                }
            }
            // $user = null;
            // if($data['user_id'] > 0){
            //     $user = UserModel::detail($data['user_id']);
            //     if($user['user_type'] != 1){
            //         $this->error = '该用户已绑定或正在审核';
            //         return false;
            //     }
            // }
            $arr = [
                'user_name' => trim($data['user_name']),
                'password' => salt_hash($data['password']),
@@ -77,11 +77,11 @@
            }
            $model->saveAll($add_arr);
            // 后台添加的直接算审核通过
            if($user){
                $user->save([
                    'user_type' => 2
                ]);
            }
            // if($user){
            //     $user->save([
            //         'user_type' => 2
            //     ]);
            // }
            // 事务提交
            $this->commit();
            return true;
@@ -110,18 +110,18 @@
                $old_user_id = $this['user']['user_id'];
            }
            $userChange = false;
            if($this['user'] && $data['user_id'] > 0 && $data['user_id'] != $this['user']['user_id']){
                $user = UserModel::detail($data['user_id']);
                if($user['user_type'] != 1){
                    $this->error = '该用户已绑定，或绑定的商户正在审核';
                    return false;
                }
                $userChange = true;
            }
            // if($this['user'] && $data['user_id'] > 0 && $data['user_id'] != $this['user']['user_id']){
            //     $user = UserModel::detail($data['user_id']);
            //     if($user['user_type'] != 1){
            //         $this->error = '该用户已绑定，或绑定的商户正在审核';
            //         return false;
            //     }
            //     $userChange = true;
            // }

            $arr = [
                'user_name' => $data['user_name'],
                'user_id' => $data['user_id'],
                // 'user_id' => $data['user_id'],
                'real_name' => $data['real_name'],
            ];
            if (!empty($data['password'])) {
@@ -142,17 +142,17 @@
            }
            $model->saveAll($add_arr);
            // 后台添加的直接算审核通过
            if($userChange){
                $user->save([
                    'user_type' => 2
                ]);
                //取消原来的
                if ($old_user_id > 0){
                    (new UserModel())->where('user_id', '=', $old_user_id)->update([
                        'user_type' => 1
                    ]);
                }
            }
            // if($userChange){
            //     $user->save([
            //         'user_type' => 2
            //     ]);
            //     //取消原来的
            //     if ($old_user_id > 0){
            //         (new UserModel())->where('user_id', '=', $old_user_id)->update([
            //             'user_type' => 1
            //         ]);
            //     }
            // }
            // 事务提交
            $this->commit();
            return true;