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']; diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 706989d0c..0dafcc27c 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){ + $gfflg = false; + } $title .= (getCompanyBlong($_REQUEST['company_belong'])."-"); } if (isset($_REQUEST['promote_id'])) { diff --git a/Application/Admin/View/UserActionLog/operateLog.html b/Application/Admin/View/UserActionLog/operateLog.html index 01ec89429..465aab4fb 100644 --- a/Application/Admin/View/UserActionLog/operateLog.html +++ b/Application/Admin/View/UserActionLog/operateLog.html @@ -53,9 +53,9 @@