diff --git a/app/admin/controller/Erp/OrganizationController.php b/app/admin/controller/Erp/OrganizationController.php index 50b1dc0..24f847b 100644 --- a/app/admin/controller/Erp/OrganizationController.php +++ b/app/admin/controller/Erp/OrganizationController.php @@ -35,6 +35,7 @@ class OrganizationController extends BaseController { $detail = Organization::where('id', $id)->where('delete_time', null)->find()->toArray(); $detail['leader_name'] = AdminUser::where('id', $detail['leader_id'])->value('name'); + $detail['parent_name'] = Organization::where('id', $detail['parent_id'])->value('org_name'); return json([ 'code' => 200, 'msg' => '获取成功', diff --git a/app/admin/route/routes/erp.php b/app/admin/route/routes/erp.php index 1a6fafc..530a038 100644 --- a/app/admin/route/routes/erp.php +++ b/app/admin/route/routes/erp.php @@ -3,9 +3,9 @@ use think\facade\Route; // 组织机构管理路由 Route::group('erp', function() { - Route::get('organization', 'app\admin\controller\Erp\OrganizationController/getOrganization'); + Route::get('getOrganization', 'app\admin\controller\Erp\OrganizationController/getOrganization'); Route::get('getOrganizationDetail/:id', 'app\admin\controller\Erp\OrganizationController/getOrganizationDetail'); - Route::post('organization', 'app\admin\controller\Erp\OrganizationController/createOrganization'); - Route::post('organization/:id', 'app\admin\controller\Erp\OrganizationController/editOrganization'); - Route::delete('organization/:id', 'app\admin\controller\Erp\OrganizationController/deleteOrganization'); + Route::post('createOrganization', 'app\admin\controller\Erp\OrganizationController/createOrganization'); + Route::post('editOrganization/:id', 'app\admin\controller\Erp\OrganizationController/editOrganization'); + Route::delete('deleteOrganization/:id', 'app\admin\controller\Erp\OrganizationController/deleteOrganization'); });