diff --git a/app/ExceptionHandler.php b/app/ExceptionHandler.php index 1ac0cd7..804d2d2 100644 --- a/app/ExceptionHandler.php +++ b/app/ExceptionHandler.php @@ -25,7 +25,7 @@ class ExceptionHandler extends Handler return json(['code' => 0, 'msg' => $exception->getMessage(),'show'=>1]); } return response($exception->getMessage()); - } elseif ($exception instanceof \Exception) { + } elseif ($exception instanceof \Error || $exception instanceof \ErrorException) { $isDebug = config('app.debug'); $error = [ 'show' => 1, diff --git a/app/common/model/works/bgsp/OaFlowType.php b/app/common/model/works/bgsp/OaFlowType.php index 0977605..7b757ea 100644 --- a/app/common/model/works/bgsp/OaFlowType.php +++ b/app/common/model/works/bgsp/OaFlowType.php @@ -33,6 +33,6 @@ class OaFlowType extends BaseModel public function getTypeTextAttr($value,$data){ $dict = DictData::where('type_value', 'oa_approve_cate')->column('name','value'); - return !empty($data['type']) ? $dict[$data['type']] : ''; + return !empty($data['type']) ? $dict[$data['type']] ?? '' : ''; } } \ No newline at end of file diff --git a/app/oa/controller/works/bgsp/OaApproveController.php b/app/oa/controller/works/bgsp/OaApproveController.php index c2ad467..9f35061 100644 --- a/app/oa/controller/works/bgsp/OaApproveController.php +++ b/app/oa/controller/works/bgsp/OaApproveController.php @@ -2,7 +2,7 @@ namespace app\oa\controller\works\bgsp; - use app\oa\controller\BaseAdminController; + use app\admin\controller\BaseAdminController; use app\common\model\auth\Admin; use app\common\model\dept\Dept; use app\common\model\works\bgsp\OaFlow; @@ -12,7 +12,7 @@ class OaApproveController extends BaseAdminController { public function lists(){ - $params = $this->request->get(['type','page_no','page_size']); + $params = $this->request->get(); $page_no = !empty($params['page_no']) ? $params['page_no'] : 1; $page_size = !empty($params['page_size']) ? $params['page_size'] : 15; if(empty($params['type']) || !in_array($params['type'],[1,2,3,4,5])){ @@ -36,12 +36,16 @@ } $lists = Db::name('oa_approve')->field('id,type,flow_id,admin_id,check_admin_ids,check_status,create_time')->where('admin_id',$this->adminId)->where($where) ->page($page_no, $page_size)->order('id desc')->select()->each(function($data){ - $admin = Admin::field('name,dept_id')->where('id',$data['admin_id'])->findOrEmpty(); - $dept = Dept::where('id',$admin['dept_id'])->value('name'); + $admin = Admin::field('id,name,dept_id')->where('id',$data['admin_id'])->findOrEmpty()->toArray(); + if (!empty($admin['dept_id'])) { + $dept = Dept::where('id',$admin['dept_id'][0])->value('name'); + $data['dept_name'] = $dept ?? ''; + } else { + $data['dept_name'] = ''; + } $flow_type = OaFlowType::where('id',$data['type'])->value('title'); $check_admin_users = Admin::where('id','in',$data['check_admin_ids'])->column('name'); $data['user_name'] = $admin['name']; - $data['dept_name'] = $dept ?? ''; $data['type_name'] = $flow_type ?? ''; $data['check_admin_users'] = !empty($check_admin_users) ? implode(',',$check_admin_users) : ''; $data['create_time'] = date('Y-m-d H:i:s',$data['create_time']); diff --git a/app/oa/controller/works/bgsp/OaFlowController.php b/app/oa/controller/works/bgsp/OaFlowController.php index 7ae842b..b8882f5 100644 --- a/app/oa/controller/works/bgsp/OaFlowController.php +++ b/app/oa/controller/works/bgsp/OaFlowController.php @@ -16,7 +16,7 @@ namespace app\oa\controller\works\bgsp; -use app\oa\controller\BaseAdminController; +use app\admin\controller\BaseAdminController; use app\oa\lists\works\bgsp\OaFlowLists; use app\oa\logic\works\bgsp\OaFlowLogic; use app\oa\validate\works\bgsp\OaFlowValidate; diff --git a/app/oa/controller/works/bgsp/OaFlowTypeController.php b/app/oa/controller/works/bgsp/OaFlowTypeController.php index 9211da5..0d14534 100644 --- a/app/oa/controller/works/bgsp/OaFlowTypeController.php +++ b/app/oa/controller/works/bgsp/OaFlowTypeController.php @@ -13,13 +13,13 @@ // +---------------------------------------------------------------------- -namespace app\adminapi\controller\works\bgsp; +namespace app\oa\controller\works\bgsp; -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\works\bgsp\OaFlowTypeLists; -use app\adminapi\logic\works\bgsp\OaFlowTypeLogic; -use app\adminapi\validate\works\bgsp\OaFlowTypeValidate; +use app\admin\controller\BaseAdminController; +use app\oa\lists\works\bgsp\OaFlowTypeLists; +use app\oa\logic\works\bgsp\OaFlowTypeLogic; +use app\oa\validate\works\bgsp\OaFlowTypeValidate; /** diff --git a/app/oa/controller/works/finance/ExpenseController.php b/app/oa/controller/works/finance/ExpenseController.php index 907a98d..3ae87dc 100644 --- a/app/oa/controller/works/finance/ExpenseController.php +++ b/app/oa/controller/works/finance/ExpenseController.php @@ -1,9 +1,9 @@ column('name'); $data['check_admin_users'] = !empty($check_admin_users) ? implode(',',$check_admin_users) : ''; $data['copy_users'] = !empty($copy_users) ? implode(',',$copy_users) : ''; - $data['detail'] = json_decode($data['detail'],true); - $data['annex'] = json_decode($data['annex'],true); + $data['detail'] = empty($data['detail']) ? [] : json_decode($data['detail'],true); + $data['annex'] = empty($data['annex']) ? [] : json_decode($data['annex'],true); $data['total_amount'] = 0; foreach ($data['detail'] as &$v){ $data['total_amount'] += $v['amount']; @@ -225,7 +225,7 @@ } public function lists(){ - $params = $this->request->get(['start_time','end_time','status','page_no','page_size']); + $params = $this->request->get(); $page_no = !empty($params['page_no']) ? $params['page_no'] : 1; $page_size = !empty($params['page_size']) ? $params['page_size'] : 15; $where = []; @@ -249,11 +249,15 @@ } $lists = Db::name('oa_expense')->field('id,code,income_month,expense_time,admin_id,check_admin_ids,check_status,pay_admin_id,pay_time,create_time,detail')->where('admin_id',$this->adminId)->where($where) ->page($page_no, $page_size)->order('id desc')->select()->each(function($data){ - $admin = Admin::field('name,dept_id')->where('id',$data['admin_id'])->findOrEmpty(); - $dept = Dept::where('id',$admin['dept_id'])->value('name'); + $admin = Admin::field('id,name,dept_id')->where('id',$data['admin_id'])->findOrEmpty(); + if (!empty($admin['dept_id'])) { + $dept = Dept::where('id',$admin['dept_id'][0])->value('name'); + $data['dept_name'] = $dept; + } else { + $data['dept_name'] = ''; + } $check_admin_users = Admin::where('id','in',$data['check_admin_ids'])->column('name'); $data['user_name'] = $admin['name']; - $data['dept_name'] = $dept ?? ''; $data['check_admin_users'] = !empty($check_admin_users) ? implode(',',$check_admin_users) : ''; $data['create_time'] = date('Y-m-d H:i:s',$data['create_time']); $data['income_month'] = date('Y-m',$data['income_month']); diff --git a/app/oa/controller/works/finance/IncomeController.php b/app/oa/controller/works/finance/IncomeController.php index 6ca144c..d746220 100644 --- a/app/oa/controller/works/finance/IncomeController.php +++ b/app/oa/controller/works/finance/IncomeController.php @@ -1,8 +1,8 @@