|
@@ -455,18 +455,19 @@ Class Manage
|
|
|
public function getmyTotal($admin_id,$type) {
|
|
|
// $info = Dever::db('work/info')->getmyAll(array('audit_admin'=>$admin_id,'state'=>1));
|
|
|
$data = Dever::db('work/info_log')->getmyAll(array('app_admin_id'=>$admin_id,'state'=>1));
|
|
|
- // $work_info = array_merge($info,$data);
|
|
|
- // $rest = array();
|
|
|
- // foreach($work_info as $k=>$v){
|
|
|
- // $rest[$v['info_id']]=$v;
|
|
|
- // }
|
|
|
+ $res = Dever::db('work/info_log')->getmyAll(array('admin_id'=>$admin_id));
|
|
|
+ $work_info = array_merge($data,$res);
|
|
|
+ $rest = array();
|
|
|
+ foreach($work_info as $k=>$v){
|
|
|
+ $rest[$v['info_id']]=$v;
|
|
|
+ }
|
|
|
// print_R($data);die;
|
|
|
$search_ids = '';
|
|
|
- if ($data) {
|
|
|
- $search_ids = implode(',',array_keys($data));
|
|
|
+ if ($rest) {
|
|
|
+ $search_ids = implode(',',array_keys($rest));
|
|
|
}
|
|
|
if ($type == 1) {
|
|
|
- return count($data);
|
|
|
+ return count($rest);
|
|
|
} else {
|
|
|
return $search_ids;
|
|
|
}
|