|
|
@@ -120,7 +120,7 @@ class SignsService extends BaseService
|
|
|
$cateId = isset($params['cate_id'])? $params['cate_id'] : 0;
|
|
|
$siyuanId = isset($params['siyuan_id'])? $params['siyuan_id'] : 0;
|
|
|
if(!in_array($type, [1,2])){
|
|
|
- return message('打开类型参数错误', false);
|
|
|
+ return message('打卡类型参数错误', false);
|
|
|
}
|
|
|
|
|
|
$cateInfo = SignCatesModel::where(['id'=> $cateId,'mark'=> 1,'status'=> 1])
|
|
|
@@ -151,7 +151,7 @@ class SignsService extends BaseService
|
|
|
|
|
|
// 验证今天是否签到过
|
|
|
$checkInfo = [];
|
|
|
- $where = ['type'=> $type,'user_id'=> $userId, 'siyuan_id'=> $siyuanId,'mark'=> 1,'status'=> 1];
|
|
|
+ $where = ['type'=> $type,'user_id'=> $userId,'mark'=> 1,'status'=> 1];
|
|
|
if(in_array($cateId, [1,2])){
|
|
|
$checkInfo = SignsModel::where($where)->whereIn('cate_id',[1,2])
|
|
|
->where('sign_at','>=', date('Y-m-d'))
|