|
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
|
|
|
use App\Http\Requests\Manager\Personnel\Department as Request;
|
|
use App\Http\Requests\Manager\Personnel\Department as Request;
|
|
|
use App\Models\Manager\Personnel\Department as DepartmentModel;
|
|
use App\Models\Manager\Personnel\Department as DepartmentModel;
|
|
|
use App\Models\Manager\Personnel\Employee as EmployeeModel;
|
|
use App\Models\Manager\Personnel\Employee as EmployeeModel;
|
|
|
|
|
+use App\Models\Manager\Personnel\EmployeeDepartment as EmployeeDepartmentModel;
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -172,7 +173,7 @@ class Department extends Controller
|
|
|
* @date 2025-12-04
|
|
* @date 2025-12-04
|
|
|
*
|
|
*
|
|
|
*/
|
|
*/
|
|
|
- public function set_status(Request $request, DepartmentModel $DepartmentModel, EmployeeModel $EmployeeModel)
|
|
|
|
|
|
|
+ public function set_status(Request $request, DepartmentModel $DepartmentModel, EmployeeDepartmentModel $EmployeeDepartmentModel)
|
|
|
{
|
|
{
|
|
|
// 验证参数
|
|
// 验证参数
|
|
|
$request->scene('set_status')->validate();
|
|
$request->scene('set_status')->validate();
|
|
@@ -182,7 +183,7 @@ class Department extends Controller
|
|
|
if ($status == 1) {
|
|
if ($status == 1) {
|
|
|
// 查询部门下是否有员工
|
|
// 查询部门下是否有员工
|
|
|
$map = ['department_id' => $id];
|
|
$map = ['department_id' => $id];
|
|
|
- $data = $EmployeeModel->where($map)->first();
|
|
|
|
|
|
|
+ $data = $EmployeeDepartmentModel->where($map)->first();
|
|
|
if ($data) return json_send(['code' => 'error', 'msg' => '该部门下存在员工,不能禁用']);
|
|
if ($data) return json_send(['code' => 'error', 'msg' => '该部门下存在员工,不能禁用']);
|
|
|
}
|
|
}
|
|
|
// 查询用户
|
|
// 查询用户
|