|
@@ -21,9 +21,7 @@ $role = function()
|
|
|
};
|
|
|
$new_shop = Dever::input('search_option_new_shop_id');
|
|
|
$group = 't_1.mid,t_1.new_shop_id';
|
|
|
-if ($new_shop) {
|
|
|
- Dever::input('search_option_status', 1);
|
|
|
-}
|
|
|
+
|
|
|
$admin = Dever::load('manage/auth.info');
|
|
|
$admin_auth = false;
|
|
|
if ($admin && $admin['role'] == 24){
|
|
@@ -194,6 +192,7 @@ return array
|
|
|
'end_cdate' => array('yes-t_1.cdate','<='),
|
|
|
'new_shop_id' => 'yes-t_1.new_shop_id',
|
|
|
'agent-member-role' => 'yes-t_2.role',
|
|
|
+ 'status' => 'yes-t_1.status',
|
|
|
'state' => 'yes-t_1.state-1',
|
|
|
),
|
|
|
'join' => array
|