From cb137323d81a3c4c46e72f8856c03dc801dcaec9 Mon Sep 17 00:00:00 2001 From: hdm Date: Tue, 6 Sep 2022 22:09:17 +0800 Subject: [PATCH] =?UTF-8?q?page=5Fsize=E8=AF=BB=E5=8F=96=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/adm/common.php | 2 +- app/adm/controller/Car.php | 2 +- app/adm/controller/Meeting.php | 2 +- app/adm/controller/Seal.php | 2 +- app/adm/middleware.php | 2 +- app/adm/validate/CarCateCheck.php | 2 +- app/adm/validate/MeetingCateCheck.php | 2 +- app/adm/validate/SealCateCheck.php | 2 +- app/api/BaseController.php | 2 +- app/api/common.php | 2 +- app/api/controller/Index.php | 2 +- app/api/middleware/Auth.php | 2 +- app/article/common.php | 2 +- app/article/controller/Cate.php | 2 +- app/article/controller/Index.php | 6 +++--- app/article/middleware.php | 2 +- app/article/model/Article.php | 2 +- app/article/validate/ArticleCateCheck.php | 2 +- app/article/validate/ArticleCheck.php | 2 +- app/base/BaseController.php | 10 ++++++++-- app/business/common.php | 2 +- app/business/controller/Analysis.php | 2 +- app/business/middleware.php | 2 +- app/common.php | 2 +- app/contract/common.php | 2 +- app/contract/controller/Api.php | 2 +- app/contract/controller/Cate.php | 2 +- app/contract/controller/Index.php | 2 +- app/contract/middleware.php | 2 +- app/contract/model/Contract.php | 4 ++-- app/contract/model/ContractLog.php | 2 +- app/contract/validate/ContractCateCheck.php | 2 +- app/contract/validate/ContractCheck.php | 2 +- app/customer/common.php | 2 +- app/customer/controller/Api.php | 6 +++--- app/customer/controller/Contact.php | 4 ++-- app/customer/controller/Grade.php | 2 +- app/customer/controller/Index.php | 8 ++++---- app/customer/controller/Source.php | 2 +- app/customer/middleware.php | 2 +- app/customer/model/Customer.php | 2 +- app/customer/model/CustomerChance.php | 2 +- app/customer/model/CustomerContact.php | 2 +- app/customer/model/CustomerLog.php | 2 +- app/customer/model/CustomerTrace.php | 2 +- app/customer/validate/CustomerCheck.php | 2 +- app/customer/validate/CustomerContactCheck.php | 2 +- app/customer/validate/CustomerGradeCheck.php | 2 +- app/customer/validate/CustomerSourceCheck.php | 2 +- app/finance/common.php | 2 +- app/finance/controller/Expense.php | 2 +- app/finance/controller/Income.php | 2 +- app/finance/controller/Invoice.php | 2 +- app/finance/middleware.php | 2 +- app/finance/model/Expense.php | 2 +- app/finance/model/Invoice.php | 4 ++-- app/home/common.php | 2 +- app/home/controller/Api.php | 2 +- app/home/controller/Cate.php | 2 +- app/home/controller/Conf.php | 2 +- app/home/controller/Database.php | 2 +- app/home/controller/Flow.php | 2 +- app/home/controller/Index.php | 4 ++-- app/home/controller/Keywords.php | 4 ++-- app/home/controller/Log.php | 4 ++-- app/home/controller/Module.php | 2 +- app/home/controller/Role.php | 2 +- app/home/controller/Rule.php | 2 +- app/home/middleware.php | 2 +- app/home/middleware/Install.php | 2 +- app/home/model/AdminGroup.php | 2 +- app/home/model/AdminLog.php | 2 +- app/home/model/Keywords.php | 2 +- app/home/validate/ConfCheck.php | 2 +- app/home/validate/CostCateCheck.php | 2 +- app/home/validate/ExpenseCateCheck.php | 2 +- app/home/validate/FlowCheck.php | 2 +- app/home/validate/FlowTypeCheck.php | 2 +- app/home/validate/GroupCheck.php | 2 +- app/home/validate/IndustryCheck.php | 2 +- app/home/validate/InvoiceSubjectCheck.php | 2 +- app/home/validate/KeywordsCheck.php | 2 +- app/home/validate/ModuleCheck.php | 2 +- app/home/validate/RuleCheck.php | 2 +- app/home/validate/ServicesCheck.php | 2 +- app/home/validate/UserCheck.php | 2 +- app/home/validate/WorkCateCheck.php | 2 +- app/install/controller/Index.php | 2 +- app/install/validate/InstallCheck.php | 2 +- app/message/common.php | 2 +- app/message/controller/Index.php | 2 +- app/message/middleware.php | 2 +- app/message/model/Message.php | 2 +- app/middleware.php | 2 +- app/note/common.php | 2 +- app/note/controller/Index.php | 4 ++-- app/note/middleware.php | 2 +- app/note/validate/NoteCateCheck.php | 2 +- app/oa/common.php | 2 +- app/oa/controller/Approve.php | 8 ++++---- app/oa/controller/Plan.php | 4 ++-- app/oa/controller/Schedule.php | 4 ++-- app/oa/controller/Work.php | 2 +- app/oa/middleware.php | 2 +- app/oa/model/Work.php | 2 +- app/oa/model/WorkRecord.php | 2 +- app/project/controller/Api.php | 2 +- app/project/controller/Index.php | 2 +- app/project/controller/Task.php | 2 +- app/project/model/ProjectDocument.php | 2 +- app/project/model/ProjectLog.php | 2 +- app/project/model/ProjectTask.php | 2 +- app/user/common.php | 2 +- app/user/controller/Department.php | 2 +- app/user/controller/Personal.php | 6 +++--- app/user/controller/Position.php | 2 +- app/user/controller/User.php | 6 +++--- app/user/middleware.php | 2 +- app/user/model/Admin.php | 2 +- app/user/validate/AdminCheck.php | 2 +- app/user/validate/DepartmentCheck.php | 2 +- app/user/validate/PositionCheck.php | 2 +- public/index.php | 2 +- 123 files changed, 153 insertions(+), 147 deletions(-) diff --git a/app/adm/common.php b/app/adm/common.php index 212b2d8..9fca1cc 100644 --- a/app/adm/common.php +++ b/app/adm/common.php @@ -1,7 +1,7 @@ field('a.*,a.id as id,c.title as cate_title,a.title as title,d.title as department,u.name as user') ->alias('a') @@ -59,7 +59,7 @@ class Index extends BaseController } $where[] = ['a.delete_time', '=', 0]; $where[] = ['a.uid', '=', $this->uid]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $content = ArticleList::where($where) ->field('a.*,a.id as id,c.title as cate_title,a.title as title') ->alias('a') diff --git a/app/article/middleware.php b/app/article/middleware.php index d3b1172..7fd70d1 100644 --- a/app/article/middleware.php +++ b/app/article/middleware.php @@ -1,7 +1,7 @@ uid = Session::get($session_admin)['id']; $this->did = Session::get($session_admin)['did']; View::assign('login_user', $this->uid); + $user = Db::name('Admin')->where(['id' => $this->uid])->find(); + $is_lock = $user['is_lock']; + if($is_lock==1){ + redirect('/home/login/lock.html')->send(); + exit; + } // 验证用户访问权限 if (($this->module == 'api') || ($this->module == 'message') || ($this->module == 'home' && $this->controller == 'index')) { return true; } else{ - $reg_pwd = Db::name('Admin')->where(['id' => $this->uid])->value('reg_pwd'); + $reg_pwd = $user['reg_pwd']; if($reg_pwd!==''){ redirect('/home/api/edit_password.html')->send(); exit; diff --git a/app/business/common.php b/app/business/common.php index 212b2d8..9fca1cc 100644 --- a/app/business/common.php +++ b/app/business/common.php @@ -1,7 +1,7 @@ field('id,name,address')->order('id asc')->where($where)->paginate($rows, false)->each(function($item, $key){ $contact = Db::name('CustomerContact')->where(['cid'=>$item['id'],'is_default'=>1])->find(); if(!empty($contact)){ diff --git a/app/contract/controller/Cate.php b/app/contract/controller/Cate.php index 9f707a3..b68c1ef 100644 --- a/app/contract/controller/Cate.php +++ b/app/contract/controller/Cate.php @@ -1,7 +1,7 @@ where(function ($query) use($whereOr) { $query->whereOr($whereOr); diff --git a/app/contract/model/ContractLog.php b/app/contract/model/ContractLog.php index 370b0ee..63812ec 100644 --- a/app/contract/model/ContractLog.php +++ b/app/contract/model/ContractLog.php @@ -57,7 +57,7 @@ class ContractLog extends Model $where = []; $where[] = ['a.contract_id', '=', $param['contract_id']]; $page = intval($param['page']); - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $content = Db::name('ContractLog') ->field('a.*,u.name,u.thumb') ->alias('a') diff --git a/app/contract/validate/ContractCateCheck.php b/app/contract/validate/ContractCateCheck.php index 1fe796f..5836ec2 100644 --- a/app/contract/validate/ContractCateCheck.php +++ b/app/contract/validate/ContractCateCheck.php @@ -1,7 +1,7 @@ order('create_time desc') ->paginate($rows, false, ['query' => $param]) @@ -170,7 +170,7 @@ class Api extends BaseController $where = array(); $where[] = ['delete_time', '=', 0]; $where[] = ['cid', '=', $param['customer_id']]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $content = CustomerChance::where($where) ->order('create_time desc') ->paginate($rows, false, ['query' => $param]) @@ -289,7 +289,7 @@ class Api extends BaseController $where = array(); $where[] = ['delete_time', '=', 0]; $where[] = ['cid', '=', $param['customer_id']]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $content = CustomerContact::where($where) ->order('create_time desc') ->paginate($rows, false, ['query' => $param]) diff --git a/app/customer/controller/Contact.php b/app/customer/controller/Contact.php index 325a56c..e29c046 100644 --- a/app/customer/controller/Contact.php +++ b/app/customer/controller/Contact.php @@ -1,7 +1,7 @@ where(function ($query) use($whereOr) { $query->whereOr($whereOr); diff --git a/app/customer/controller/Grade.php b/app/customer/controller/Grade.php index 7935236..b658f8e 100644 --- a/app/customer/controller/Grade.php +++ b/app/customer/controller/Grade.php @@ -1,7 +1,7 @@ where(function ($query) use($whereOr) { $query->whereOr($whereOr); @@ -127,7 +127,7 @@ class Index extends BaseController $where[] = ['a.delete_time', '=', 0]; $where[] = ['a.belong_uid', '=', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $content = CustomerList::where($where) ->field('a.*,d.title as belong_department,g.title as grade,s.title as source,i.title as industry') ->alias('a') @@ -210,7 +210,7 @@ class Index extends BaseController $where[] = ['a.delete_time', '>', 0]; $where[] = ['a.belong_uid', '=', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $content = CustomerList::where($where) ->field('a.*,d.title as belong_department,g.title as grade,s.title as source,i.title as industry') ->alias('a') diff --git a/app/customer/controller/Source.php b/app/customer/controller/Source.php index c5b6b07..a830ea9 100644 --- a/app/customer/controller/Source.php +++ b/app/customer/controller/Source.php @@ -1,7 +1,7 @@ field('a.*,u.name,u.thumb') ->alias('a') diff --git a/app/customer/model/CustomerTrace.php b/app/customer/model/CustomerTrace.php index c343463..33edb6f 100644 --- a/app/customer/model/CustomerTrace.php +++ b/app/customer/model/CustomerTrace.php @@ -1,7 +1,7 @@ order('id desc') diff --git a/app/finance/model/Invoice.php b/app/finance/model/Invoice.php index 29e4a13..dfd1aff 100644 --- a/app/finance/model/Invoice.php +++ b/app/finance/model/Invoice.php @@ -7,7 +7,7 @@ class Invoice extends Model //发票列表检索 public function get_list($param=[],$where = [], $type='and') { - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; if($type == 'or'){ $list = Invoice::field('i.*,a.name,d.title as department_name') ->alias('i') @@ -65,7 +65,7 @@ class Invoice extends Model //到账列表检索 public function income_list($param = [], $where = []) { - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $list = Invoice::where($where) ->order('is_cash asc,create_time desc') ->paginate($rows, false, ['query' => $param]) diff --git a/app/home/common.php b/app/home/common.php index d907ad8..82f52a6 100644 --- a/app/home/common.php +++ b/app/home/common.php @@ -1,7 +1,7 @@ order('id desc') ->paginate($rows, false, ['query' => $param]) diff --git a/app/home/controller/Keywords.php b/app/home/controller/Keywords.php index 4c73011..f280025 100644 --- a/app/home/controller/Keywords.php +++ b/app/home/controller/Keywords.php @@ -1,7 +1,7 @@ =', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $content = Db::name('Keywords') ->order('create_time desc') ->where($where) diff --git a/app/home/controller/Log.php b/app/home/controller/Log.php index 3720f59..f51b9d2 100644 --- a/app/home/controller/Log.php +++ b/app/home/controller/Log.php @@ -1,7 +1,7 @@ field("id,uid,name,action,title,content,rule_menu,ip,param_id,param,FROM_UNIXTIME(create_time,'%Y-%m-%d %H:%i:%s') create_time") ->order('create_time desc') diff --git a/app/home/controller/Module.php b/app/home/controller/Module.php index 1103ea2..ea67039 100644 --- a/app/home/controller/Module.php +++ b/app/home/controller/Module.php @@ -1,7 +1,7 @@ =', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $note = NoteList::where($where) ->field('a.*,c.title as cate_title') ->alias('a') diff --git a/app/note/middleware.php b/app/note/middleware.php index d3b1172..7fd70d1 100644 --- a/app/note/middleware.php +++ b/app/note/middleware.php @@ -1,7 +1,7 @@ uid]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $list = Db::name('Approve') ->field('f.*,a.name,d.title as department_name,t.title as flow_type') ->alias('f') @@ -72,7 +72,7 @@ class Approve extends BaseController $map1[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',check_admin_ids)")]; $map2[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',flow_admin_ids)")]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; if($status == 0){ $list = Db::name('Approve') @@ -153,7 +153,7 @@ class Approve extends BaseController $map = []; $map[] = ['check_status', '=', 2]; $map[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',copy_uids)")]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $list = Db::name('Approve') ->field('f.*,a.name,d.title as department_name,t.title as flow_type') ->alias('f') diff --git a/app/oa/controller/Plan.php b/app/oa/controller/Plan.php index b3658f4..f30f265 100644 --- a/app/oa/controller/Plan.php +++ b/app/oa/controller/Plan.php @@ -1,7 +1,7 @@ uid]; } $where[] = ['a.delete_time', '=', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $plan = PlanList::where($where) ->field('a.*,u.name as create_admin') ->alias('a') diff --git a/app/oa/controller/Schedule.php b/app/oa/controller/Schedule.php index 8e1fafb..4f9f62b 100644 --- a/app/oa/controller/Schedule.php +++ b/app/oa/controller/Schedule.php @@ -1,7 +1,7 @@ field('a.*,u.name,d.title as department,w.title as work_cate') ->alias('a') diff --git a/app/oa/controller/Work.php b/app/oa/controller/Work.php index f8f1879..398c054 100644 --- a/app/oa/controller/Work.php +++ b/app/oa/controller/Work.php @@ -1,7 +1,7 @@ field('a.*,u.name,d.title as department,t.title as task,p.name as project,w.title as work_cate') ->alias('a') diff --git a/app/project/controller/Index.php b/app/project/controller/Index.php index 80bbc8e..518074c 100644 --- a/app/project/controller/Index.php +++ b/app/project/controller/Index.php @@ -39,7 +39,7 @@ class Index extends BaseController if (request()->isAjax()) { $param = get_params(); $project_ids = Db::name('ProjectUser')->where(['uid' => $this->uid, 'delete_time' => 0])->column('project_id'); - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $auth = isAuth($this->uid,'contract_admin'); $where = []; diff --git a/app/project/controller/Task.php b/app/project/controller/Task.php index cc1bc79..ce16d5f 100644 --- a/app/project/controller/Task.php +++ b/app/project/controller/Task.php @@ -194,7 +194,7 @@ class Task extends BaseController } } $where[] = ['a.delete_time', '=', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $schedule = ScheduleList::where($where) ->field('a.*,u.name,d.title as department,w.title as work_cate') ->alias('a') diff --git a/app/project/model/ProjectDocument.php b/app/project/model/ProjectDocument.php index ed08709..0ab5e98 100644 --- a/app/project/model/ProjectDocument.php +++ b/app/project/model/ProjectDocument.php @@ -28,7 +28,7 @@ class ProjectDocument extends Model $where[] = ['title|content', 'like', '%' . $param['keywords'] . '%']; } $where[] = ['delete_time', '=', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $list = Db::name('ProjectDocument')->where(function ($query) use ($map1, $map2) { $query->where($map1)->whereor($map2); })->where($where) diff --git a/app/project/model/ProjectLog.php b/app/project/model/ProjectLog.php index efffe9b..80f978a 100644 --- a/app/project/model/ProjectLog.php +++ b/app/project/model/ProjectLog.php @@ -146,7 +146,7 @@ class ProjectLog extends Model $where3[] = ['a.module', '=', 'document']; $where3[] = ['a.document_id', 'in', $document_ids]; $page = intval($param['page']); - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $content = Db::name('ProjectLog') ->field('a.*,u.name,u.thumb') ->alias('a') diff --git a/app/project/model/ProjectTask.php b/app/project/model/ProjectTask.php index b514753..38762e1 100644 --- a/app/project/model/ProjectTask.php +++ b/app/project/model/ProjectTask.php @@ -76,7 +76,7 @@ class ProjectTask extends Model $where[] = ['title|content', 'like', '%' . $param['keywords'] . '%']; } $where[] = ['delete_time', '=', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $list = Db::name('ProjectTask')->where(function ($query) use ($map1, $map2, $map3, $map4) { $query->where($map1)->whereor($map2)->whereor($map3)->whereor($map4); })->where($where) diff --git a/app/user/common.php b/app/user/common.php index 212b2d8..9fca1cc 100644 --- a/app/user/common.php +++ b/app/user/common.php @@ -1,7 +1,7 @@ field('p.*,u.name as name,ad.name as admin,a.title as adepartment,b.title as bdepartment') ->alias('p') @@ -97,7 +97,7 @@ class Personal extends BaseController $where['u.name|p.remark'] = ['like', '%' . $param['keywords'] . '%']; } $where['p.status'] = array('eq', 1); - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $list = PersonalQuit::where($where) ->field('p.*,u.name as name,d.title as department,ps.title as position') ->alias('p') diff --git a/app/user/controller/Position.php b/app/user/controller/Position.php index f4285aa..51281da 100644 --- a/app/user/controller/Position.php +++ b/app/user/controller/Position.php @@ -1,7 +1,7 @@ order('id desc') ->paginate($rows, false, ['query' => $param]) @@ -268,7 +268,7 @@ class User extends BaseController if (!empty($param['rule_menu'])) { $where['rule_menu'] = $param['rule_menu']; } - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $content = DB::name('AdminLog') ->field("id,uid,name,action,title,content,rule_menu,ip,param_id,param,FROM_UNIXTIME(create_time,'%Y-%m-%d %H:%i:%s') create_time") ->order('create_time desc') diff --git a/app/user/middleware.php b/app/user/middleware.php index d3b1172..7fd70d1 100644 --- a/app/user/middleware.php +++ b/app/user/middleware.php @@ -1,7 +1,7 @@