...
|
...
|
@@ -858,9 +858,13 @@ class User extends Api |
|
|
{
|
|
|
$UserId = $this->is_token($this->request->header());
|
|
|
$params = $this->request->param();
|
|
|
$TimeArray = $this->mFristAndLast($params['Y'], $params['M']);
|
|
|
$Map['g.createtime'] = ['between', [$TimeArray['start'], $TimeArray['end']]];
|
|
|
$Map3['createtime'] = ['between', [$TimeArray['start'], $TimeArray['end']]];
|
|
|
$Map = [];
|
|
|
$Map3 = [];
|
|
|
if ($params['Y'] != 0 && $params['M'] != 0) {
|
|
|
$TimeArray = $this->mFristAndLast($params['Y'], $params['M']);
|
|
|
$Map['g.createtime'] = ['between', [$TimeArray['start'], $TimeArray['end']]];
|
|
|
$Map3['createtime'] = ['between', [$TimeArray['start'], $TimeArray['end']]];
|
|
|
}
|
|
|
$map2 = [];
|
|
|
if ($params['type'] != 0) {
|
|
|
$map2['u.level'] = ['EQ', $params['type']];
|
...
|
...
|
|