[智价云] 部门角色查询更新

app/Http/Controllers/Manager/Personnel/Department.php

@@ -36,7 +36,7 @@ class Department extends Controller
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
-        if ($status) $map[] = ['status', '=', $status];
+        if (is_numeric($status)) $map[] = ['status', '=', $status];
         if ($name) $map[] = ['name', 'like', "%$name%"];
         // 查询数据
         $result = $DepartmentModel->query()
@@ -59,7 +59,7 @@ class Department extends Controller
     public function all(DepartmentModel $DepartmentModel)
     {
         $map  = [];
-        $status    = request('status', '');
+        $status    = request('status', '0');
         $start_time = request('start_time', '');
         $end_time = request('end_time', '');
         $name = request('name', '');
@@ -67,7 +67,7 @@ class Department extends Controller
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
-        if ($status) $map[] = ['status', '=', $status];
+        if (is_numeric($status)) $map[] = ['status', '=', $status];
         if ($name) $map[] = ['name', 'like', "%$name%"];
         $result = $DepartmentModel->query()
             ->where($map)

app/Http/Controllers/Manager/Personnel/Roles.php

@@ -35,7 +35,7 @@ class Roles extends Controller
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
-        if ($status) $map[] = ['status', '=', $status];
+        if (is_numeric($status)) $map[] = ['status', '=', $status];
         if ($name) $map[] = ['name', 'like', "%$name%"];
         // 查询数据
         $result = $RolesModel->query()
@@ -58,7 +58,7 @@ class Roles extends Controller
     public function all(RolesModel $RolesModel)
     {
         $map  = [];
-        $status    = request('status', '');
+        $status    = request('status', '0');
         $start_time = request('start_time', '');
         $end_time = request('end_time', '');
         $name = request('name', '');
@@ -66,7 +66,7 @@ class Roles extends Controller
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
-        if ($status) $map[] = ['status', '=', $status];
+        if (is_numeric($status)) $map[] = ['status', '=', $status];
         if ($name) $map[] = ['name', 'like', "%$name%"];
         // 查询数据
         $result = $RolesModel->query()