|
@@ -202,7 +202,7 @@ class gworkermodel extends Model {
|
|
return $rlist;
|
|
return $rlist;
|
|
}
|
|
}
|
|
|
|
|
|
- public function selinfobywhere($where) {
|
|
|
|
|
|
+ public function selinfobywhere($where, $page = 1, $size = 10) {
|
|
$field = "w.*,IFNULL(tab.quactive,0) qu_active,IFNULL(tab.quisanswer,0) qu_isanswer";
|
|
$field = "w.*,IFNULL(tab.quactive,0) qu_active,IFNULL(tab.quisanswer,0) qu_isanswer";
|
|
$strsql = "select " . $field . " from t_workerinfo as w
|
|
$strsql = "select " . $field . " from t_workerinfo as w
|
|
left join (select id,user_id,is_active as quactive,is_answer as quisanswer from t_question_user where is_active=1) as tab on tab.user_id=w.id";
|
|
left join (select id,user_id,is_active as quactive,is_answer as quisanswer from t_question_user where is_active=1) as tab on tab.user_id=w.id";
|
|
@@ -212,21 +212,22 @@ class gworkermodel extends Model {
|
|
$name = $where['wname'];
|
|
$name = $where['wname'];
|
|
$usewhere[] = "wname like '%" . $name . "%'";
|
|
$usewhere[] = "wname like '%" . $name . "%'";
|
|
}
|
|
}
|
|
- if (isset($where['qu_active']) && !empty($where['qu_active'])) {
|
|
|
|
|
|
+ if (isset($where['qu_active']) && in_array($where['qu_active'], [0, 1]) && "" != $where['qu_active']) {
|
|
$qu_active = $where['qu_active'];
|
|
$qu_active = $where['qu_active'];
|
|
$usewhere[] = "qu_active='" . $qu_active . "'";
|
|
$usewhere[] = "qu_active='" . $qu_active . "'";
|
|
}
|
|
}
|
|
- if (isset($where['qu_isanswer']) && !empty($where['qu_isanswer'])) {
|
|
|
|
|
|
+ if (isset($where['qu_isanswer']) && in_array($where['qu_isanswer'], [0, 1]) && "" != $where['qu_isanswer']) {
|
|
$qu_isanswer = $where['qu_isanswer'];
|
|
$qu_isanswer = $where['qu_isanswer'];
|
|
$usewhere[] = "qu_isanswer='" . $qu_isanswer . "'";
|
|
$usewhere[] = "qu_isanswer='" . $qu_isanswer . "'";
|
|
}
|
|
}
|
|
- if (!empty($where)) {
|
|
|
|
|
|
+ if (!empty($usewhere)) {
|
|
$where_str = implode(" and ", $usewhere);
|
|
$where_str = implode(" and ", $usewhere);
|
|
$strsql .= " where " . $where_str;
|
|
$strsql .= " where " . $where_str;
|
|
}
|
|
}
|
|
$ordre = "id,cprojectid";
|
|
$ordre = "id,cprojectid";
|
|
$strsql .= " order by " . $ordre;
|
|
$strsql .= " order by " . $ordre;
|
|
-
|
|
|
|
|
|
+ $index = ($page - 1) * $size;
|
|
|
|
+ $strsql .= " limit " . $index . "," . $size;
|
|
$rlist = $this->query($strsql);
|
|
$rlist = $this->query($strsql);
|
|
$rlist = collection($rlist)->toArray();
|
|
$rlist = collection($rlist)->toArray();
|
|
return $rlist;
|
|
return $rlist;
|