edit

tool/work/database/appoint.php

@@ -245,5 +245,19 @@ return array
             'order' => array('id' => 'desc'),
             'col' => '*',
         ),
+        'getmyAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                // 'info_id' => 'yes',
+                'admin' => 'yes',
+                // 'end' =>array('yes-cdate','<='),
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('id' => 'desc'),
+            'col' => '*|info_id',
+        ),
     ),
 );

tool/work/database/info.php

@@ -101,8 +101,9 @@ if ($search_auth == 2) {
         {
             $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);
+            $app = Dever::db('work/appoint')->getmyAll(array('admin'=>$admin_id));
+            $d = array_merge($info,$data);
+            $work_info = array_merge($d,$app);
             $rest = array();
             foreach($work_info as $k=>$v){
                 $rest[$v['info_id']]=$v;
@@ -117,6 +118,8 @@ if ($search_auth == 2) {
                 $search_ids = implode(',',array_keys($rest));
             }
             return count($rest);
+            // Dever::load('work/lib/manage')->getmyTotal($admin_id,false);
+            // 
             }, 'search_option_dever_auth=2&search_option_state=1&search_option_ids=' . $search_ids);
 
 } 

tool/work/lib/Manage.php

@@ -455,8 +455,10 @@ 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));
-		// print_R($data);die;
-		$work_info = array_merge($info,$data);
+		$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;