diff --git a/app/adminapi/lists/contract/ContractLists.php b/app/adminapi/lists/contract/ContractLists.php index d34511a19..cebad313d 100644 --- a/app/adminapi/lists/contract/ContractLists.php +++ b/app/adminapi/lists/contract/ContractLists.php @@ -59,14 +59,14 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface $params=$this->request->param(); $where=[]; if ($this->adminInfo['root'] != 1) { - if($this->adminInfo['role_id'][0]==10){ - if(isset($params['type']) && $params['type']==1){ - $where[] = ['check_status', '=',1]; - }else{ - $where[] = ['status', '=',0]; - $where[] = ['check_status', 'in',[2,3]]; - } - } + // if($this->adminInfo['role_id'][0]==10){ + // if(isset($params['type']) && $params['type']==1){ + // $where[] = ['check_status', '=',1]; + // }else{ + // $where[] = ['status', '=',0]; + // $where[] = ['check_status', 'in',[2,3]]; + // } + // } } if(isset($params['company_id']) && $params['company_id']!=''){ $arr= Company::where('company_name','like','%'.$params['company_id'].'%')->column('id'); diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php index c25bd99e9..536ff5438 100644 --- a/app/common/logic/task/TaskLogic.php +++ b/app/common/logic/task/TaskLogic.php @@ -171,11 +171,6 @@ class TaskLogic extends BaseLogic 'transaction' => ['arr' => ['day_money' => $user_count_money, 'total_price' => 0]] ]; $data['extend'] = json_encode($extend); - // if($user_count_money<$v['transaction_pool']){ - // TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>bcsub($v['transaction_pool'],$user_count_money,2)]); - // }else{ - // TaskTemplate::where('id', $v['id'])->update(['transaction_pool'=>0]); - // } } $task_id = (new Task())->insertGetId($data); TaskSchedulingPlan::where('id', $TaskSchedulingPlan['id'])->update(['task_id' => $task_id, 'is_execute' => 1]);