diff --git a/app/admin/model/Task.php b/app/admin/model/Task.php new file mode 100644 index 0000000..f790190 --- /dev/null +++ b/app/admin/model/Task.php @@ -0,0 +1,13 @@ +request->isPost()) { + return $this->renderError('不支持GET请求'); + } + $data = $this->postData(); + $page = isset($data['page']) && !empty($data['page']) ? $data['page'] : 1; + $limit = isset($data['limit']) && !empty($data['limit']) ? $data['limit'] : 20; + + $IpModel = new IpModel(); + $where = ['status' => 1]; + $list = $IpModel->withoutField('update_time, delete_time, create_time, status') + ->where($where) + ->order('id desc') + ->page($page, $limit) + ->select() + ->each(function ($item) { + $item['expire_time'] = $item['expire_time'] ? date('Y-m-d H:i:s', $item['expire_time']) : '-'; + return $item; + }); + return $this->renderSuccess($list->toArray()); + } + +} diff --git a/app/api/controller/User.php b/app/api/controller/User.php index e4d852e..9679917 100644 --- a/app/api/controller/User.php +++ b/app/api/controller/User.php @@ -2,6 +2,7 @@ namespace app\api\controller; +use app\admin\model\Task; use app\admin\model\User as UserModel; use app\api\middleware\LcJWTAuth; use think\response\Json; @@ -26,7 +27,8 @@ class User extends ApiController if ($row['gender']) { $row['gender'] = $model->genderArr[$row['gender']] ?? ''; } + $row['task_count'] = Task::where([['assign_uid' , '=', $row['uid']], ['status' ,'in', [1,2]]])->count(); return $this->renderSuccess($row->toArray()); } -} \ No newline at end of file +}