master
ELF 4 years ago
parent 38c10a0f7a
commit 73f5f4f5ea

@ -78,7 +78,7 @@ class MemberController extends ThinkController
$map['tab_user.is_repeat'] = $_REQUEST['is_repeat']; $map['tab_user.is_repeat'] = $_REQUEST['is_repeat'];
$is_repeat = true; $is_repeat = true;
} }
$isMarketAdmin = isMarketAdmin();
$map = withMarketAdminCondition($map, I('market_admin_id', 0)); $map = withMarketAdminCondition($map, I('market_admin_id', 0));
if (isset($_REQUEST['status'])) { if (isset($_REQUEST['status'])) {

@ -122,7 +122,7 @@ class SpendController extends ThinkController
// $map = '1 = 2'; // $map = '1 = 2';
// $map1 = $map; // $map1 = $map;
// } // }
$this->checkListOrCountAuthRestMap($map,["extend", "pay_order_number", "user_account"]); // $this->checkListOrCountAuthRestMap($map,["extend", "pay_order_number", "user_account"]);
$map1 = $map; $map1 = $map;
$map1['pay_status'] = 1; $map1['pay_status'] = 1;
$total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount')); $total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount'));

@ -665,7 +665,7 @@ class UserController extends AdminController
$map['role_id'] = trim($_REQUEST['role_id']); $map['role_id'] = trim($_REQUEST['role_id']);
unset($_REQUEST['role_id']); unset($_REQUEST['role_id']);
} }
$isMarketAdmin = isMarketAdmin();
$map = withMarketAdminCondition($map, I('market_admin_id', 0)); $map = withMarketAdminCondition($map, I('market_admin_id', 0));
// $promoteRoot = getPowerPromoteIds(); // $promoteRoot = getPowerPromoteIds();

Loading…
Cancel
Save