diff --git a/Application/Home/Controller/PromoteCoinController.class.php b/Application/Home/Controller/PromoteCoinController.class.php index 9c92f59e3..7c5250560 100644 --- a/Application/Home/Controller/PromoteCoinController.class.php +++ b/Application/Home/Controller/PromoteCoinController.class.php @@ -372,6 +372,19 @@ class PromoteCoinController extends BaseController $conditions['create_time'] = ['elt', strtotime($endTime. ' 23:59:59')]; } } + if($sn) { + $conditions['sn'] = $sn; + } + if($account) { + $map1['account'] = ['like','%'.$account.'%']; + $promotesRs = M('promote','tab_')->field('id')->where($map1)->select(); + $idArr = ""; + foreach ($promotesRs as $key => $value) { + $idArr .= intval($value['id']).','; + } + $idArr1 = rtrim($idArr,','); + $conditions['target_id'] = ['in',$idArr1]; + } $query = M('promote_coin_transfer_log', 'tab_')->where($conditions)->order('create_time desc'); list($logs, $pagination, $count) = $this->paginate($query); diff --git a/Application/Home/View/default/PromoteCoin/transferLogs.html b/Application/Home/View/default/PromoteCoin/transferLogs.html index 94611b9d1..2282a02c9 100644 --- a/Application/Home/View/default/PromoteCoin/transferLogs.html +++ b/Application/Home/View/default/PromoteCoin/transferLogs.html @@ -20,7 +20,7 @@