Merge branch 'hotfix/bug_change_now' of wmtx/platform into release

汇总删除修正
master
郑永星 4 years ago committed by Gogs
commit 77e8161159

@ -378,7 +378,7 @@ class CompanyStatementController extends ThinkController
if($value['withdraw_type'] !=3) { if($value['withdraw_type'] !=3) {
$this->DBModel->where("id = {$value['id']} and verify_status = 0")->delete(); $this->DBModel->where("id = {$value['id']} and verify_status = 0")->delete();
} else { } else {
$this->DBModel->where("id = {$value['id']}")->delete(); $this->DBModel->where("id = {$value['id']} and verify_status != 2")->delete();
} }
} }

@ -494,8 +494,8 @@
var flag = false; var flag = false;
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
if (id=="delStatement"&&$(elem).data("type")==3) { if (id=="delStatement"&&$(elem).data("type")==3&&$(elem).data("status") == 2) {
return $(elem).val(); flag = true;
} }
if($.inArray( $(elem).data("status"),status) == -1||(id=="updateStatement" && $(elem).data("type")==3)){ if($.inArray( $(elem).data("status"),status) == -1||(id=="updateStatement" && $(elem).data("type")==3)){

Loading…
Cancel
Save