Your Name 3 년 전
부모
커밋
0f52f25107
2개의 변경된 파일16개의 추가작업 그리고 30개의 파일을 삭제
  1. 2 4
      tool/work/database/info.php
  2. 14 26
      tool/work/lib/Manage.php

+ 2 - 4
tool/work/database/info.php

@@ -96,12 +96,10 @@ if ($search_auth == 2) {
     $data[]= array('待我处理',function() use ($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,'1,2');}, 'search_option_dever_auth=2&search_option_status=1,2&search_option_appoint_id=' . $admin_id);
     $data[]= array('处理完成',function() use($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,'3,4');}, 'search_option_dever_auth=2&search_option_status=3,4&search_option_fpeople=' . $admin_id);
     $data[]= array('我创建的',function() use($admin_id) {return Dever::load('work/lib/manage')->getTotal($admin_id,false);}, 'search_option_dever_auth=2&search_option_state=1&search_option_audit_admin=' . $admin_id);
-    $search_ids = Dever::load('work/lib/manage')->getSearch($admin_id);
+    $search_ids = Dever::load('work/lib/manage')->getMyTotal($admin_id,2);
 
     $data[]= array('和我相关的',function() use($admin_id) {
-           return Dever::load('work/lib/manage')->getmyTotal($admin_id);
-           
-            // Dever::load('work/lib/manage')->getmyTotal($admin_id,false);
+           return Dever::load('work/lib/manage')->getmyTotal($admin_id,1);
     }, 'search_option_dever_auth=2&search_option_state=1&search_option_ids=' . $search_ids);
 
 } 

+ 14 - 26
tool/work/lib/Manage.php

@@ -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;
-		
 	}
 }