|
...
|
...
|
@@ -1436,7 +1436,7 @@ class CommonController extends RestBaseController |
|
|
|
$res = Db::name($table)
|
|
|
|
->alias('c')
|
|
|
|
->join('project p','c.project_id = p.id','LEFT')
|
|
|
|
->whereIn('c.project_id',$pids)
|
|
|
|
//->whereIn('c.project_id',$pids)
|
|
|
|
->where(function ($query) use ($ins_m_time,$data) {
|
|
|
|
//状态
|
|
|
|
if (isset($data['status'])) {
|
|
...
|
...
|
@@ -1480,7 +1480,7 @@ class CommonController extends RestBaseController |
|
|
|
$count = $res = Db::name($table)
|
|
|
|
->alias('c')
|
|
|
|
->join('project p','c.project_id = p.id','LEFT')
|
|
|
|
->whereIn('c.project_id',$pids)
|
|
|
|
//->whereIn('c.project_id',$pids)
|
|
|
|
->where(function ($query) use ($table,$data) {
|
|
|
|
//状态
|
|
|
|
if (isset($data['status'])) {
|
...
|
...
|
|
