|
@@ -311,17 +311,18 @@ class Manage
|
|
{
|
|
{
|
|
$main = Dever::param('main', $data);
|
|
$main = Dever::param('main', $data);
|
|
$key = Dever::param('key', $data);
|
|
$key = Dever::param('key', $data);
|
|
|
|
+ $company_id = Dever::param('company_id', $data);
|
|
if (!$key) {
|
|
if (!$key) {
|
|
Dever::alert('请传入账户索引');
|
|
Dever::alert('请传入账户索引');
|
|
}
|
|
}
|
|
|
|
|
|
if ($main == 2) {
|
|
if ($main == 2) {
|
|
- $main = Dever::db('option/member')->getMain(array('key' => $key));
|
|
|
|
|
|
+ $main = Dever::db('option/member')->getMain(array('key' => $key, 'company_id' => $company_id));
|
|
if (!$main) {
|
|
if (!$main) {
|
|
Dever::alert('请先创建主账号');
|
|
Dever::alert('请先创建主账号');
|
|
}
|
|
}
|
|
} elseif ($main == 1) {
|
|
} elseif ($main == 1) {
|
|
- $main = Dever::db('option/member')->getMain(array('key' => $key));
|
|
|
|
|
|
+ $main = Dever::db('option/member')->getMain(array('key' => $key, 'company_id' => $company_id));
|
|
if ($main) {
|
|
if ($main) {
|
|
Dever::alert('已存在主账号');
|
|
Dever::alert('已存在主账号');
|
|
}
|
|
}
|