正在显示
3 个修改的文件
包含
18 行增加
和
3 行删除
| @@ -9,7 +9,17 @@ use App\Models\User\ViewDeptUser; | @@ -9,7 +9,17 @@ use App\Models\User\ViewDeptUser; | ||
| 9 | 9 | ||
| 10 | class DeptUserController extends BaseController | 10 | class DeptUserController extends BaseController |
| 11 | { | 11 | { |
| 12 | - | 12 | + /** |
| 13 | + * @name :name | ||
| 14 | + * @return void | ||
| 15 | + * @author :liyuhang | ||
| 16 | + * @method | ||
| 17 | + */ | ||
| 18 | + public function lists(ViewDeptUser $viewDeptUser){ | ||
| 19 | + $this->map['project_id'] = $this->user['project_id']; | ||
| 20 | + $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,'user_id'); | ||
| 21 | + $this->response('success',Code::SUCCESS,$lists); | ||
| 22 | + } | ||
| 13 | /** | 23 | /** |
| 14 | * @param ViewDeptUser $viewDeptUser | 24 | * @param ViewDeptUser $viewDeptUser |
| 15 | * @name :(详情)info | 25 | * @name :(详情)info |
| @@ -21,9 +21,13 @@ class UserController extends BaseController | @@ -21,9 +21,13 @@ class UserController extends BaseController | ||
| 21 | * @author :liyuhang | 21 | * @author :liyuhang |
| 22 | * @method | 22 | * @method |
| 23 | */ | 23 | */ |
| 24 | - public function lists(ViewDeptUser $viewDeptUser){ | 24 | + public function lists(UserModel $userModel){ |
| 25 | + //TODO::搜索参数统一处理 | ||
| 25 | $this->map['project_id'] = $this->user['project_id']; | 26 | $this->map['project_id'] = $this->user['project_id']; |
| 26 | - $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,'user_id'); | 27 | + $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at','wechat','status']); |
| 28 | + if(empty($lists)){ | ||
| 29 | + $this->response('error',Code::USER_ERROR,[]); | ||
| 30 | + } | ||
| 27 | $this->response('success',Code::SUCCESS,$lists); | 31 | $this->response('success',Code::SUCCESS,$lists); |
| 28 | } | 32 | } |
| 29 | 33 |
| @@ -176,6 +176,7 @@ Route::middleware(['bloginauth'])->group(function () { | @@ -176,6 +176,7 @@ Route::middleware(['bloginauth'])->group(function () { | ||
| 176 | //成员管理 | 176 | //成员管理 |
| 177 | //组织架构 | 177 | //组织架构 |
| 178 | Route::prefix('user')->group(function () { | 178 | Route::prefix('user')->group(function () { |
| 179 | + Route::any('/', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'lists'])->name('dept_user'); | ||
| 179 | Route::any('/save', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'save'])->name('dept_user_add'); | 180 | Route::any('/save', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'save'])->name('dept_user_add'); |
| 180 | Route::any('/info', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'info'])->name('dept_user_info'); | 181 | Route::any('/info', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'info'])->name('dept_user_info'); |
| 181 | Route::any('/set_admin', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'set_admin'])->name('dept_user_set_admin'); | 182 | Route::any('/set_admin', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'set_admin'])->name('dept_user_set_admin'); |
-
请 注册 或 登录 后发表评论