正在显示
3 个修改的文件
包含
7 行增加
和
6 行删除
@@ -300,13 +300,14 @@ class AdminExcelDataController extends AdminBaseController | @@ -300,13 +300,14 @@ class AdminExcelDataController extends AdminBaseController | ||
300 | 300 | ||
301 | //获取文件后缀 | 301 | //获取文件后缀 |
302 | public function getFileSuffix($image_url){ | 302 | public function getFileSuffix($image_url){ |
303 | - $suffix = pathinfo($image_url, PATHINFO_EXTENSION); | ||
304 | - if($suffix == 'png'){ | 303 | + //判断文件真实类型 |
304 | + $suffix = getimagesize($image_url); | ||
305 | + if($suffix['mime'] == 'image/png'){ | ||
305 | //png | 306 | //png |
306 | - return @imagecreatefrompng($image_url); | 307 | + return imagecreatefrompng($image_url); |
307 | }else{ | 308 | }else{ |
308 | //jpg | 309 | //jpg |
309 | - return @imagecreatefromjpeg($image_url); | 310 | + return imagecreatefromjpeg($image_url); |
310 | } | 311 | } |
311 | } | 312 | } |
312 | 313 |
@@ -78,7 +78,7 @@ class AdminWorkStatisticalAController extends AdminBaseController | @@ -78,7 +78,7 @@ class AdminWorkStatisticalAController extends AdminBaseController | ||
78 | //查询甲方人员id | 78 | //查询甲方人员id |
79 | public function getPartA(){ | 79 | public function getPartA(){ |
80 | $staff = Db::name('company') | 80 | $staff = Db::name('company') |
81 | - ->where(['pid'=>0]) | 81 | + ->where(['pid'=>['neq',0]]) |
82 | ->field('id,company_name,u_s_id,u_l_id,u_ls_id,is_children,company_name_head') | 82 | ->field('id,company_name,u_s_id,u_l_id,u_ls_id,is_children,company_name_head') |
83 | ->select() | 83 | ->select() |
84 | ->toArray(); | 84 | ->toArray(); |
@@ -78,7 +78,7 @@ class AdminWorkStatisticalBController extends AdminBaseController | @@ -78,7 +78,7 @@ class AdminWorkStatisticalBController extends AdminBaseController | ||
78 | //查询甲方人员id | 78 | //查询甲方人员id |
79 | public function getPartB(){ | 79 | public function getPartB(){ |
80 | $staff = Db::name('company') | 80 | $staff = Db::name('company') |
81 | - ->where(['pid'=>['<>',0]]) | 81 | + ->where(['pid'=>0]) |
82 | ->field('id,company_name,u_s_id,u_l_id,u_ls_id') | 82 | ->field('id,company_name,u_s_id,u_l_id,u_ls_id') |
83 | ->select() | 83 | ->select() |
84 | ->toArray(); | 84 | ->toArray(); |
-
请 注册 或 登录 后发表评论