|
@@ -31,11 +31,11 @@ class Facility extends Api
|
|
|
$this->error('请求错误');
|
|
$this->error('请求错误');
|
|
|
}
|
|
}
|
|
|
$param = $this->request->param();
|
|
$param = $this->request->param();
|
|
|
- if (isset($param['sort'])){
|
|
|
|
|
- $where['使用部门'] = '智能车间';
|
|
|
|
|
- }else{
|
|
|
|
|
- $where['使用部门'] = ['<>','智能车间'];
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if (isset($param['sort'])){
|
|
|
|
|
+// $where['使用部门'] = '智能车间';
|
|
|
|
|
+// }else{
|
|
|
|
|
+// $where['使用部门'] = ['<>','智能车间'];
|
|
|
|
|
+// }
|
|
|
$data = [];
|
|
$data = [];
|
|
|
$date = date('Y-m-d 00:00:00',time()-3888000);
|
|
$date = date('Y-m-d 00:00:00',time()-3888000);
|
|
|
$department = \db('设备_基本资料')
|
|
$department = \db('设备_基本资料')
|
|
@@ -43,7 +43,7 @@ class Facility extends Api
|
|
|
->where('使用部门','<>','研发中心')
|
|
->where('使用部门','<>','研发中心')
|
|
|
->where('设备编组','<>','')
|
|
->where('设备编组','<>','')
|
|
|
->where('sys_sbID','<>','')
|
|
->where('sys_sbID','<>','')
|
|
|
- ->where($where)
|
|
|
|
|
|
|
+// ->where($where)
|
|
|
->order('设备编组')
|
|
->order('设备编组')
|
|
|
->column('rtrim(使用部门) as 使用部门');
|
|
->column('rtrim(使用部门) as 使用部门');
|
|
|
if (empty($department)){
|
|
if (empty($department)){
|
