正在显示
1 个修改的文件
包含
2 行增加
和
10 行删除
@@ -319,11 +319,6 @@ class AdminOrderController extends AdminBaseController | @@ -319,11 +319,6 @@ class AdminOrderController extends AdminBaseController | ||
319 | $log = Db::name('CompareLog')->where($where_log)->column('resume_user_id'); | 319 | $log = Db::name('CompareLog')->where($where_log)->column('resume_user_id'); |
320 | $res_log = array_unique(array_filter($log)); | 320 | $res_log = array_unique(array_filter($log)); |
321 | $res = array(); | 321 | $res = array(); |
322 | - echo "<pre/>"; | ||
323 | - print_r($log); | ||
324 | - echo "<br/>"; | ||
325 | - print_r($member); | ||
326 | - die; | ||
327 | if($member && $log){ | 322 | if($member && $log){ |
328 | $mem_arr =array(); | 323 | $mem_arr =array(); |
329 | foreach ($member as $k=>$v){ | 324 | foreach ($member as $k=>$v){ |
@@ -331,16 +326,13 @@ class AdminOrderController extends AdminBaseController | @@ -331,16 +326,13 @@ class AdminOrderController extends AdminBaseController | ||
331 | $mem_id[]['id'] = $v['id']; | 326 | $mem_id[]['id'] = $v['id']; |
332 | } | 327 | } |
333 | $dif = array_diff($mem_arr,$res_log); | 328 | $dif = array_diff($mem_arr,$res_log); |
334 | - echo "<pre/>"; | ||
335 | - print_r($member); | ||
336 | - echo "<br/>"; | ||
337 | - print_r($dif); | ||
338 | - die; | ||
339 | foreach ($member as $mk=>$mv){ | 329 | foreach ($member as $mk=>$mv){ |
340 | if(in_array($mv['id'],$dif)){ | 330 | if(in_array($mv['id'],$dif)){ |
341 | $res[] = $mv; | 331 | $res[] = $mv; |
342 | } | 332 | } |
343 | } | 333 | } |
334 | + }else if($member){ | ||
335 | + $res = $member; | ||
344 | } | 336 | } |
345 | $final['member'] = $res; | 337 | $final['member'] = $res; |
346 | $this->assign('list',$final); | 338 | $this->assign('list',$final); |
-
请 注册 或 登录 后发表评论