From c5e272fb367253ff3bae4e0a93acc10580c6347a Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 4 Sep 2020 14:37:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index f5e6e06d0..4a42f8c3c 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -378,7 +378,7 @@ class CompanyStatementController extends ThinkController if($value['withdraw_type'] !=3) { $this->DBModel->where("id = {$value['id']} and verify_status = 0")->delete(); } else { - $this->DBModel->where("id = {$value['id']}")->delete(); + $this->DBModel->where("id = {$value['id']} and verify_status != 2")->delete(); } } From f36469031e4dca57dc70754d1e33d67ddc0cacea Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 4 Sep 2020 14:46:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyStatement/lists.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html index 824f5671c..881f6420b 100644 --- a/Application/Admin/View/CompanyStatement/lists.html +++ b/Application/Admin/View/CompanyStatement/lists.html @@ -494,8 +494,8 @@ var flag = false; var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - if (id=="delStatement"&&$(elem).data("type")==3) { - return $(elem).val(); + if (id=="delStatement"&&$(elem).data("type")==3&&$.inArray( $(elem).data("status"),status) == 2) { + flag = true; } if($.inArray( $(elem).data("status"),status) == -1||(id=="updateStatement" && $(elem).data("type")==3)){ From d35ce5694e31d95c787aacc3ca7b25a7633e3180 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 4 Sep 2020 14:50:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyStatement/lists.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html index 881f6420b..bec1fa4de 100644 --- a/Application/Admin/View/CompanyStatement/lists.html +++ b/Application/Admin/View/CompanyStatement/lists.html @@ -494,7 +494,7 @@ var flag = false; var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - if (id=="delStatement"&&$(elem).data("type")==3&&$.inArray( $(elem).data("status"),status) == 2) { + if (id=="delStatement"&&$(elem).data("type")==3&&$(elem).data("status") == 2) { flag = true; }