Your Name преди 3 години
родител
ревизия
8956f07af8
променени са 2 файла, в които са добавени 34 реда и са изтрити 27 реда
  1. 6 17
      tool/work/database/info.php
  2. 28 10
      tool/work/lib/Manage.php

+ 6 - 17
tool/work/database/info.php

@@ -96,24 +96,13 @@ 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 ='';
-    $data[]= array('和我相关的',function() use($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));
-            // $app = Dever::db('work/appoint')->getmyAll(array('admin'=>$admin_id));
-            $work_info = array_merge($info,$data);
-            // $work_info = array_merge($d,$app);
-            $rest = array();
-            foreach($work_info as $k=>$v){
-                $rest[$v['info_id']]=$v;
-            }
-            if ($rest) {
-                $search_ids = implode(',',array_keys($rest));
-            }
-            return count($rest);
+    $search_ids = Dever::load('work/lib/manage')->getSearch($admin_id);
+
+    $data[]= array('和我相关的',function() use($admin_id) {
+           return Dever::load('work/lib/manage')->getmyTotal($admin_id);
+           
             // Dever::load('work/lib/manage')->getmyTotal($admin_id,false);
-            }, 'search_option_dever_auth=2&search_option_state=1&search_option_ids=' . $search_ids);
+    }, 'search_option_dever_auth=2&search_option_state=1&search_option_ids=' . $search_ids);
 
 } 
 $button = array();

+ 28 - 10
tool/work/lib/Manage.php

@@ -454,15 +454,33 @@ Class Manage
 	}
 	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('admin_id'=>$admin_id,'state'=>1));
-		$app = Dever::db('work/appoint')->getmyAll(array('admin'=>$admin_id));
-		// print_R($app);die;
-		$d = array_merge($info,$data);
-		$work_info = array_merge($d,$app);
-		$rest = array();
-		foreach($work_info as $k=>$v){
-			$rest[$v['info_id']]=$v;
-		}
-		return count($rest);
+	    $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) {
+		// $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;
+	    }
+	    $search_ids = '';
+	    if ($rest) {
+	        $search_ids = implode(',',array_keys($rest));
+	    }
+	    return $search_ids;
+		
 	}
 }