Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type

master
zhengyongxing 5 years ago
commit f124e4b7ff

@ -446,7 +446,6 @@ class PlatformController extends ThinkController
} else {
$map['tp1.chain'] = '/';
}
//为数据权限添加
setPowerPromoteIds($map, 'u.promote_id');
@ -462,7 +461,6 @@ class PlatformController extends ThinkController
->group('tp1.id')
->order('count desc, register_time')
->select();
// echo $data;die();
//今日/本周/本月不变
$tmap = $map;
if(isset($tmap['register_time'])){
@ -493,8 +491,6 @@ class PlatformController extends ThinkController
->group('tp1.id')
->order('register_time')
->select();
// dd($tdata);die();
$tmdata = [];
foreach($data as $k=>$v){
$v['today'] = 0;
@ -521,7 +517,7 @@ class PlatformController extends ThinkController
unset($map['tp1.id']);
unset($map['tp1.chain']);
unset($tmap['tp1.chain']);
unset($tmap['tp1.id']);
unset($tmap['tp1.chain']);
$map['u.promote_id'] = 0;
$tmap['u.promote_id'] = 0;

Loading…
Cancel
Save