Merge pull request '奖惩先去除限制逻辑' (#93) from hotfix/rewardlimit into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/93
master
郑永星 4 years ago
commit 9336691b39

@ -524,10 +524,10 @@ class StatementMangementController extends ThinkController
if ($id) {
$checkReward = $this->checkRewardDetail($settlmentSet);
if ($checkReward) {
return $this->error("奖惩确认时间需在结算时间以后,请重新选择");
}
// $checkReward = $this->checkRewardDetail($settlmentSet);
// if ($checkReward) {
// return $this->error("奖惩确认时间需在结算时间以后,请重新选择");
// }
$upt = M('reward_record', 'tab_')->where(['id'=>$id])->save($data);
if ($upt === false) {
@ -543,10 +543,10 @@ class StatementMangementController extends ThinkController
}
} else {
$checkReward = $this->checkRewardDetail($settlmentSet);
if ($checkReward) {
return $this->error("奖惩确认时间需在结算时间以后,请重新选择");
}
// $checkReward = $this->checkRewardDetail($settlmentSet);
// if ($checkReward) {
// return $this->error("奖惩确认时间需在结算时间以后,请重新选择");
// }
$data['create_time'] = time();
$data['creater_id'] = is_login();

Loading…
Cancel
Save