Your Name 2 年之前
父節點
當前提交
b9e3636204
共有 2 個文件被更改,包括 10 次插入8 次删除
  1. 1 0
      tool/work/database/info_log.php
  2. 9 8
      tool/work/lib/Manage.php

+ 1 - 0
tool/work/database/info_log.php

@@ -140,6 +140,7 @@ return array
             'option' => array
             (
                 'app_admin_id' => 'yes',
+                'admin_id' => 'yes',
                 'state' => 1,
             ),
             'type' => 'all',

+ 9 - 8
tool/work/lib/Manage.php

@@ -455,18 +455,19 @@ Class Manage
 	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 = array_merge($info,$data);
-	    // $rest = array();
-	    // foreach($work_info as $k=>$v){
-	    //     $rest[$v['info_id']]=$v;
-	    // }
+	    $res = Dever::db('work/info_log')->getmyAll(array('admin_id'=>$admin_id));
+	    $work_info = array_merge($data,$res);
+	    $rest = array();
+	    foreach($work_info as $k=>$v){
+	        $rest[$v['info_id']]=$v;
+	    }
 	    // print_R($data);die;
 	    $search_ids = '';
-	    if ($data) {
-	        $search_ids = implode(',',array_keys($data));
+	    if ($rest) {
+	        $search_ids = implode(',',array_keys($rest));
 	    }
 	    if ($type == 1) {
-	    	return count($data);
+	    	return count($rest);
 	    } else {
 	    	return $search_ids;
 	    }