|
@@ -30,7 +30,7 @@ class inventlogic extends baselogic
|
|
|
['name' => 'companyid', 'title' => 'companyid', 'require' => true, 'type' => 'numeric'],
|
|
|
['name' => 'passstate', 'title' => 'passstate', 'type' => 'numeric', 'regex' => '/[0|1|2]{1}/'],
|
|
|
['name' => 'activestate', 'title' => 'activestate', 'type' => 'numeric', 'regex' => '/[0|1]{1}/'],
|
|
|
- ['name' => 'title', 'title' => 'title', 'type' => 'string', 'regex' => '/*{5,}/'],
|
|
|
+ ['name' => 'title', 'title' => 'title', 'type' => 'string', 'regex' => '/.{2,}/'],
|
|
|
],
|
|
|
'updatebyid' => [
|
|
|
['name' => 'id', 'title' => 'companyid', 'require' => true, 'type' => 'numeric'],
|
|
@@ -91,15 +91,15 @@ class inventlogic extends baselogic
|
|
|
return backarr(0, "企业信息不存在");
|
|
|
}
|
|
|
$m_i = new inventmodel();
|
|
|
- $where = ['company_id' => $companyid];
|
|
|
+ $where = [['company_id' ,'=', $companyid]];
|
|
|
if (isset($arr['title'])) {
|
|
|
- $where['title'] = ['like' => '%' . $arr['title'] . '%'];
|
|
|
+ $where[] = ['title','like' , '%' . $arr['title'] . '%'];
|
|
|
}
|
|
|
if (isset($arr['activestate'])) {
|
|
|
- $where['active_state'] = $arr['passstate'];
|
|
|
+ $where[] = ['active_state','=',$arr['activestate']];
|
|
|
}
|
|
|
if (isset($arr['passstate'])) {
|
|
|
- $where['pass_state'] = $arr['passstate'];
|
|
|
+ $where[] = ['pass_state','=',$arr['passstate']];
|
|
|
}
|
|
|
$page = isset($arr['page']) && !empty($arr['page']) ? $arr['page'] : 1;
|
|
|
$size = isset($arr['size']) && !empty($arr['size']) ? $arr['size'] : 10;
|