|
@@ -452,35 +452,23 @@ Class Manage
|
|
|
$data = Dever::db('work/info')->getTotal($where);
|
|
|
return $data;
|
|
|
}
|
|
|
- public function getmyTotal($admin_id) {
|
|
|
- $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;
|
|
|
- }
|
|
|
- $search_ids = '';
|
|
|
- if ($rest) {
|
|
|
- $search_ids = implode(',',array_keys($rest));
|
|
|
- }
|
|
|
- return count($rest);
|
|
|
-
|
|
|
- }
|
|
|
- public function getSearch($admin_id) {
|
|
|
+ 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 = $data;
|
|
|
- // array_merge($info,$data);
|
|
|
- $rest = array();
|
|
|
- foreach($work_info as $k=>$v){
|
|
|
- $rest[$v['info_id']]=$v;
|
|
|
- }
|
|
|
+ // $work_info = array_merge($info,$data);
|
|
|
+ // $rest = array();
|
|
|
+ // foreach($work_info as $k=>$v){
|
|
|
+ // $rest[$v['info_id']]=$v;
|
|
|
+ // }
|
|
|
+ // print_R($data);die;
|
|
|
$search_ids = '';
|
|
|
- if ($rest) {
|
|
|
- $search_ids = implode(',',array_keys($rest));
|
|
|
+ if ($data) {
|
|
|
+ $search_ids = implode(',',array_keys($data));
|
|
|
+ }
|
|
|
+ if ($type == 1) {
|
|
|
+ return count($data);
|
|
|
+ } else {
|
|
|
+ return $search_ids;
|
|
|
}
|
|
|
- return $search_ids;
|
|
|
-
|
|
|
}
|
|
|
}
|