mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-08-17 09:57:22 +08:00
parent bb41fa8bf2
commit b1f54af78d
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/adminapi/lists/recharge/RechargeLists.php
View File

@ -104,17 +104,17 @@ class RechargeLists extends BaseAdminDataLists implements ListsSearchInterface,
*/ */
public function lists(): array public function lists(): array
{ {
$companyIds = CompanyLogic::getAllCompanyIds(); // $companyIds = CompanyLogic::getAllCompanyIds();
$field = 'ro.id,ro.sn,ro.order_amount,ro.pay_way,ro.pay_time,ro.pay_status,ro.create_time,ro.refund_status'; $field = 'ro.id,ro.sn,ro.order_amount,ro.pay_way,ro.pay_time,ro.pay_status,ro.create_time,ro.refund_status';
$field .= ',u.avatar,u.nickname,a.company_id'; $field .= ',u.avatar,u.nickname,u.company_id';
$lists = RechargeOrder::alias('ro') $lists = RechargeOrder::alias('ro')
->join('user u', 'u.id = ro.user_id') ->join('user u', 'u.id = ro.user_id')
->join('admin a', 'u.admin_id = a.id') ->join('admin a', 'u.admin_id = a.id')
->join('company c', 'a.company_id = c.id') ->join('company c', 'u.company_id = c.id')
->field($field) ->field($field)
->where($this->queryWhere()) ->where($this->queryWhere())
->where($this->searchWhere) ->where($this->searchWhere)
->where('c.id', 'in', $companyIds) // ->where('c.id', 'in', $companyIds)
->order('ro.id', 'desc') ->order('ro.id', 'desc')
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->append(['pay_status_text', 'pay_way_text']) ->append(['pay_status_text', 'pay_way_text'])

9
app/adminapi/lists/task_template/TaskTemplateLists.php
View File

@ -38,7 +38,7 @@ class TaskTemplateLists extends BaseAdminDataLists implements ListsSearchInterfa
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['title', 'admin_id', 'money', 'type', 'status', 'content'], '=' => ['title', 'admin_id', 'money', 'type', 'status', 'content','company_id'],
]; ];
} }
@ -54,14 +54,7 @@ class TaskTemplateLists extends BaseAdminDataLists implements ListsSearchInterfa
*/ */
public function lists(): array public function lists(): array
{ {
$parmas= $this->request->param();
$where=[];
if(isset($parmas['scheduling_id']) && $parmas['scheduling_id']>0){
$company_id=TaskScheduling::where(['id'=>$parmas['scheduling_id']])->value('company_id');
$where[]= ['company_id','=',$company_id];
}
return TaskTemplate::where($this->searchWhere) return TaskTemplate::where($this->searchWhere)
->where($where)
->with(['admin','data_type']) ->with(['admin','data_type'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])