修改

@@ -859,7 +859,8 @@ class User extends Api
         $UserId = $this->is_token($this->request->header());
         $UserId = $this->is_token($this->request->header());
         $params = $this->request->param();
         $params = $this->request->param();
         $TimeArray = $this->mFristAndLast($params['Y'], $params['M']);
         $TimeArray = $this->mFristAndLast($params['Y'], $params['M']);
-//        $Map['g.createtime'] = ['between', [$TimeArray['start'], $TimeArray['end']]];
+        $Map['g.createtime'] = ['between', [$TimeArray['start'], $TimeArray['end']]];
+        $Map3['createtime'] = ['between', [$TimeArray['start'], $TimeArray['end']]];
         $map2 = [];
         $map2 = [];
         if ($params['type'] != 0) {
         if ($params['type'] != 0) {
             $map2['u.level'] = ['EQ', $params['type']];
             $map2['u.level'] = ['EQ', $params['type']];
@@ -867,11 +868,11 @@ class User extends Api
         $Array = Db::name('group')
         $Array = Db::name('group')
             ->alias('g')
             ->alias('g')
             ->where('g.fuser_id', $UserId)
             ->where('g.fuser_id', $UserId)
-//            ->where($Map)
+            ->where($Map)
             ->join('user u', 'u.id=g.user_id')
             ->join('user u', 'u.id=g.user_id')
             ->where($map2)
             ->where($map2)
             ->order('id desc')
             ->order('id desc')
-            ->field('g.id,g.user_id,u.avatar,u.nickname,u.level,u.createtime')
+            ->field('g.id,g.user_id,u.avatar,u.nickname,u.level,g.createtime')
             ->select();
             ->select();
         if (empty($Array)) {
         if (empty($Array)) {
             $data = [
             $data = [
@@ -887,7 +888,7 @@ class User extends Api
                 $OldList[$k]['Nickname'] = $v['nickname'];
                 $OldList[$k]['Nickname'] = $v['nickname'];
                 $OldList[$k]['Level'] = $v['level'];
                 $OldList[$k]['Level'] = $v['level'];
                 $OldList[$k]['Createtime'] = date('Y-m-d', $v['createtime']);
                 $OldList[$k]['Createtime'] = date('Y-m-d', $v['createtime']);
-                $CountNum = Db::name('money')->where($Map)->where('touser_id', $v['user_id'])->select();
+                $CountNum = Db::name('money')->where($Map3)->where('touser_id', $v['user_id'])->select();
                 foreach ($CountNum as $key => $value) {
                 foreach ($CountNum as $key => $value) {
                     $Count[] = $value['money'];
                     $Count[] = $value['money'];
                 }
                 }