Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

tool/work/database/info.php

@@ -100,26 +100,19 @@ if ($search_auth == 2) {
     $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('admin_id'=>$admin_id,'state'=>1));
-            $app = Dever::db('work/appoint')->getmyAll(array('admin'=>$admin_id));
-            $d = array_merge($info,$data);
-            $work_info = array_merge($d,$app);
+            $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;
             }
-            // $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);
             // 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/database/info_log.php

@@ -51,6 +51,17 @@ return array
            
         ),
 
+        'app_admin_id'      => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '指派人id',
+            'default'   => '-1',
+            'desc'      => '指派人id',
+            'match'     => 'is_string',
+            // 'update'    => 'text',
+           
+        ),
+
         'appoint_id'      => array
         (
             'type'      => 'int-11',
@@ -128,7 +139,7 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
-                'admin_id' => 'yes',
+                'app_admin_id' => 'yes',
                 'state' => 1,
             ),
             'type' => 'all',

tool/work/lib/Appoint.php

@@ -84,6 +84,10 @@ Class Appoint
 				$w['info_id'] = $info['id'];
 				$w['admin_id'] = $admin_id;
 				$w['appoint_id'] = $id;
+                if (isset($branch[1]) && $branch[1]) {
+                    $w['app_admin_id'] = $branch[1];
+                }
+                
 				Dever::db('work/info_log')->insert($w);
 			}
 			if ($branch) {

tool/work/lib/Cron.php

@@ -228,4 +228,20 @@ Class Cron
             }
         }
     }
+    #同步info_log中的指派人（app_admin_id）
+    public function updateInfoLog_api()
+    {
+        $data = Dever::db('work/info_log')->state();
+        foreach ($data as $k => $v) {
+            if ($v['appoint_id']) {
+                $app = Dever::db('work/appoint')->find($v['appoint_id']);
+                if ($app) {
+                    $where['where_id'] = $v['id'];
+                    $where['app_admin_id'] = $app['admin'];
+                    $where['clear'] = true;
+                    Dever::db('work/info_log')->update($where);
+                }
+            }
+        }
+    }
 }

tool/work/lib/Manage.php

@@ -463,6 +463,6 @@ Class Manage
 		foreach($work_info as $k=>$v){
 			$rest[$v['info_id']]=$v;
 		}
-		return count($result);
+		return count($rest);
 	}
 }