diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 0ab31c840..b38df25ba 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -110,7 +110,21 @@ class PromoteCompanyController extends ThinkController // $where["_string"] = "begin_time <= {$time_end}"; // } // dd($map); - + if (I('ali_user', 0)) { + $map['ali_user'] = I('ali_user'); + } + if (I('ali_account', 0)) { + $map['ali_account'] = I('ali_account'); + } + if (I('bank_address', 0)) { + $map['bank_address'] = I('bank_address'); + } + if (I('settlement_contact', 0)) { + $map['settlement_contact'] = I('settlement_contact'); + } + if (I('contact_phone', 0)) { + $map['contact_phone'] = I('contact_phone'); + } $page = intval(I('get.p', 0)); $page = $page ? $page : 1; //默认显示第一页数据 diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php index a1167be06..a103e12cd 100644 --- a/Application/Admin/Controller/SocietyInfoController.class.php +++ b/Application/Admin/Controller/SocietyInfoController.class.php @@ -71,6 +71,9 @@ class SocietyInfoController extends ThinkController $map['communication_time'] = array('elt', time() - $gap * 86400); } if (I('sociaty_level') && I('sociaty_level') != '0') $map['sociaty_level'] = I('sociaty_level'); + if (I('num')) { + $map['id'] = substr(I('num'), 8); + } //获取分页数据 $query = $model->where($map)->order("communication_time desc"); @@ -122,7 +125,7 @@ class SocietyInfoController extends ThinkController return ; } else { $societyInfos = $order_query->page($page,$row)->field("*")->select(); -// dump($societyInfos);die(); +// dump($order_query->_sql());die(); } //分页 @@ -136,7 +139,7 @@ class SocietyInfoController extends ThinkController foreach ($societyInfos as $k => &$v) { - $v['num'] = $k+1+intval((I('get.p', 0)?I('get.p', 0):1)-1)*$row; + $v['num'] = date('Ymd', $v['create_time']).$v['id']; $v['sociaty_level_str'] = $this->level[$v['sociaty_level']]; if (time() - $v['communication_time'] > $gap * 86400 diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html index 867a1564b..7398417fd 100644 --- a/Application/Admin/View/PromoteCompany/lists.html +++ b/Application/Admin/View/PromoteCompany/lists.html @@ -140,6 +140,21 @@ +