|
|
|
@ -45,7 +45,7 @@ class UserLogic
|
|
|
|
->join('__ADMIN_STRUCTURE__ structure', 'structure.id = user.structure_id', 'LEFT')
|
|
|
|
->join('__ADMIN_STRUCTURE__ structure', 'structure.id = user.structure_id', 'LEFT')
|
|
|
|
->where($where)
|
|
|
|
->where($where)
|
|
|
|
->where($whereMap)
|
|
|
|
->where($whereMap)
|
|
|
|
->field('user.id,user.thumb_img,user.realname,user.post,structure.name as structure_name,user.mobile')
|
|
|
|
->field('user.id,user.thumb_img,user.mobile,user.realname,user.post,structure.name as structure_name,user.mobile')
|
|
|
|
->page($param['page'], $param['limit'])
|
|
|
|
->page($param['page'], $param['limit'])
|
|
|
|
->select();
|
|
|
|
->select();
|
|
|
|
foreach ($list as $k => $v) {
|
|
|
|
foreach ($list as $k => $v) {
|
|
|
|
@ -70,7 +70,7 @@ class UserLogic
|
|
|
|
->join('__ADMIN_STRUCTURE__ structure', 'structure.id = user.structure_id', 'LEFT')
|
|
|
|
->join('__ADMIN_STRUCTURE__ structure', 'structure.id = user.structure_id', 'LEFT')
|
|
|
|
->where($where)
|
|
|
|
->where($where)
|
|
|
|
->where($whereMap)
|
|
|
|
->where($whereMap)
|
|
|
|
->field('user.id,user.thumb_img,user.realname,user.post,structure.name as structure_name')
|
|
|
|
->field('user.id,user.thumb_img,user.mobile,user.realname,user.post,structure.name as structure_name')
|
|
|
|
->page($param['page'], $param['limit'])
|
|
|
|
->page($param['page'], $param['limit'])
|
|
|
|
->select();
|
|
|
|
->select();
|
|
|
|
$dataCount = Db::name('admin_user')
|
|
|
|
$dataCount = Db::name('admin_user')
|
|
|
|
|
旭晓耿
4 years ago