From d0f07315dae09ee15b0266cc82b30f69abb7c50b Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 3 Mar 2020 10:30:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A3=80=E7=B4=A2=E5=90=8D=E8=AF=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/UserActionLog/operateLog.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/UserActionLog/operateLog.html b/Application/Admin/View/UserActionLog/operateLog.html index 93395c4e1..9d359d8f8 100644 --- a/Application/Admin/View/UserActionLog/operateLog.html +++ b/Application/Admin/View/UserActionLog/operateLog.html @@ -53,9 +53,9 @@ From a340a74864786de245ecfc96ce367a045bba3be4 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 3 Mar 2020 13:52:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=A4=96=E5=9B=A2=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/FinancePromoteController.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 706989d0c..4e438d559 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -924,6 +924,9 @@ class FinancePromoteController extends AdminController } if (isset($_REQUEST['company_belong'])) { $pmap['company_belong'] = $_REQUEST['company_belong']; + if($pmap['company_belong'] != 0){ + $pmap['company_id'] = array("neq",0); + } $title .= (getCompanyBlong($_REQUEST['company_belong'])."-"); } if (isset($_REQUEST['promote_id'])) { From 650d0c8f69a17946ab35007af78aa93069ec6971 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 3 Mar 2020 14:04:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=86=85=E5=A4=96=E5=9B=A2=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinancePromoteController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 4e438d559..0dafcc27c 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -925,7 +925,7 @@ class FinancePromoteController extends AdminController if (isset($_REQUEST['company_belong'])) { $pmap['company_belong'] = $_REQUEST['company_belong']; if($pmap['company_belong'] != 0){ - $pmap['company_id'] = array("neq",0); + $gfflg = false; } $title .= (getCompanyBlong($_REQUEST['company_belong'])."-"); } From fac54ad10dba2a8ea8bb6979d8a7c46b06f7368a Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 4 Mar 2020 10:10:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=91=E5=B8=81?= =?UTF-8?q?=E6=94=B6=E5=9B=9E=E5=86=85=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/DeductBindRecordController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Controller/DeductBindRecordController.class.php b/Application/Admin/Controller/DeductBindRecordController.class.php index 68d43faa9..ce179b50d 100644 --- a/Application/Admin/Controller/DeductBindRecordController.class.php +++ b/Application/Admin/Controller/DeductBindRecordController.class.php @@ -43,6 +43,7 @@ class DeductBindRecordController extends ThinkController { *扣除绑定平台币 */ public function deductBindBalance(){ + ini_set('memory_limit', '512M'); if(IS_POST){ $_REQUEST['user_id'] = (M('user','tab_')->field('id')->where(['account'=>$_REQUEST['user_id']])->find())['id'];