edit

tool/work/database/info.php

@@ -99,11 +99,25 @@ if ($search_auth == 2) {
     $search_ids ='';
     $data[]= array('和我相关的',function() use($admin_id) 
         {
-            $search_info = Dever::db('work/info_log')->getmyAll(array('admin_id'=>$admin_id,'state'=>1));
-            if ($search_info) {
-                $search_ids = implode(',',array_keys($search_info));
+            $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));
+            // print_R($data);die;
+            $work_info = array_merge($info,$data);
+            $rest = array();
+            foreach($work_info as $k=>$v){
+                $rest[$v['info_id']]=$v;
             }
-            return count($search_info);}, 'search_option_dever_auth=2&search_option_state=1&search_option_ids=' . $search_ids);
+            // $result=array_values($rest);
+            // $search_info = Dever::db('work/info_log')->getmyAll(array('admin_id'=>$admin_id,'state'=>1));
+            // // print_R($search_info);die;
+            // if ($search_info) {
+            //     $search_ids = implode(',',array_keys($search_info));
+            // }
+            if ($rest) {
+                $search_ids = implode(',',array_keys($rest));
+            }
+            return count($rest);
+            }, 'search_option_dever_auth=2&search_option_state=1&search_option_ids=' . $search_ids);
 
 } 
 $button = array();
@@ -632,5 +646,18 @@ return array
             // 'order' => array('id' => 'desc'),
             'col' => '*',
         ),
+        'getmyAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'audit_admin' =>'yes',
+                'cate' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            // 'order' => array('id' => 'desc'),
+            'col' => 'id as info_id',
+        ),
     ),
 );

tool/work/lib/Manage.php

@@ -453,15 +453,14 @@ Class Manage
 		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('admin_id'=>$admin_id,'state'=>1));
-		foreach ($data as $k =>$v) {
-			$work[] = Dever::db('work/info')->find($v['info_id']);
+		// print_R($data);die;
+		$work_info = array_merge($info,$data);
+		$rest = array();
+		foreach($work_info as $k=>$v){
+			$rest[$v['info_id']]=$v;
 		}
-		foreach($work as $k=>$v) {
-			if (!$v) {
-				unset($work[$k]);
-			}
-		}
-		return count($work);
+		return count($result);
 	}
 }