|
@@ -47,7 +47,7 @@ class WechatPlanRecord extends Model
|
|
|
$order = "id desc";
|
|
|
if (isset($where['uid']) && $where['uid'] > 0) $xwhere['uid'] = $where['uid'];
|
|
|
if (isset($where['cid']) && $where['cid'] > 0) $xwhere['cid'] = $where['cid'];
|
|
|
- $data = $model->where($xwhere)->where('is_signing',0)->order($order)->select();
|
|
|
+ $data = $model->where($xwhere)->order($order)->select();
|
|
|
$count = $model->where($xwhere)->count();
|
|
|
return compact('count', 'data');
|
|
|
}
|
|
@@ -60,7 +60,7 @@ class WechatPlanRecord extends Model
|
|
|
if (isset($where['cid']) && $where['cid'] > 0) $xwhere['cid'] = $where['cid'];
|
|
|
if (isset($where['uid']) && $where['uid'] > 0) $xwhere['uid'] = $where['uid'];
|
|
|
|
|
|
- $data = $model->where($xwhere)->where('is_signing',0)->order($order)->find();
|
|
|
+ $data = $model->where($xwhere)->order($order)->find();
|
|
|
$count = $model->where($xwhere)->count();
|
|
|
$laveMonth = new LaveMonth();
|
|
|
$list = $laveMonth->where('user_id', $data['uid'])->where('cid',$data['cid'])->where('order_name', $data['order_name'])->select();
|