From 31948abdf4b39306fcc12127ee1631a82410dcdd Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 28 Feb 2020 15:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97bug?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserActionLogController.class.php         | 14 ++++++++++++-
 .../Admin/View/UserActionLog/operateLog.html  | 20 ++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/UserActionLogController.class.php b/Application/Admin/Controller/UserActionLogController.class.php
index ac8608df8..38ba3c12c 100644
--- a/Application/Admin/Controller/UserActionLogController.class.php
+++ b/Application/Admin/Controller/UserActionLogController.class.php
@@ -171,6 +171,12 @@ class UserActionLogController extends AdminController
             flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。
         }
         fclose($fp);
+
+        $getData = $_GET;
+        unset($getData['xlsname']);
+
+        addOperationLog(['op_type'=>3,'key'=>getNowDate(),'op_name'=>'导出操作日志','url'=>U('UserActionLog/index',$getData),'menu'=>'站点-日志管理-操作日志-导出操作日志']);
+
         exit();
 
     }
@@ -206,7 +212,7 @@ class UserActionLogController extends AdminController
             $map['admin_account'] = ['like',"%{$_REQUEST['adminname']}%"];
         }
 
-        if ($_REQUEST['op_type']) {
+        if ($_REQUEST['op_type']||$_REQUEST['op_type']=='0') {
             $map['op_type'] = $_REQUEST['op_type'];
         }
 
@@ -320,6 +326,12 @@ class UserActionLogController extends AdminController
             flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。
         }
         fclose($fp);
+
+        $getData = $_GET;
+        unset($getData['xlsname']);
+
+        addOperationLog(['op_type'=>3,'key'=>getNowDate(),'op_name'=>'导出行为日志','url'=>U('UserActionLog/index',$getData),'menu'=>'站点-日志管理-操作日志-导出行为日志']);
+
         exit();
 
     }
diff --git a/Application/Admin/View/UserActionLog/operateLog.html b/Application/Admin/View/UserActionLog/operateLog.html
index cee7e0839..93395c4e1 100644
--- a/Application/Admin/View/UserActionLog/operateLog.html
+++ b/Application/Admin/View/UserActionLog/operateLog.html
@@ -52,14 +52,24 @@
       <div class="input-list input-list-game search_label_rehab">
         <select id="op_type" name="op_type" class="select_gallery" >
           <option value="">请选择类型</option>
-            <option value="1" <if condition="$vo.op_type eq 1">selected</if> >编辑</option>
-          <option value="2" <if condition="$vo.op_type eq 2">selected</if> >删除</option>
-          <option value="3" <if condition="$vo.op_type eq 3">selected</if> >下载</option>
+          <option value="0" <if condition="$_GET['op_type'] eq '0'">selected</if> >新增</option>
+            <option value="1" <if condition="$_GET['op_type'] eq 1">selected</if> >编辑</option>
+          <option value="2" <if condition="$_GET['op_type'] eq  2">selected</if> >删除</option>
+          <option value="3" <if condition="$_GET['op_type'] eq  3">selected</if> >下载</option>
         </select>
       </div>
 
-      <div class="input-list">
-        <input type="text"  name="adminname" placeholder="操作人" class="" value="{:I('adminname')}" style="width: 180px"/>&nbsp;
+<!--      <div class="input-list">-->
+<!--        <input type="text"  name="adminname" placeholder="操作人" class="" value="{:I('adminname')}" style="width: 180px"/>&nbsp;-->
+<!--      </div>get_admin_list-->
+
+      <div class="input-list input-list-game search_label_rehab">
+        <select id="adminname" name="adminname" class="select_gallery" >
+          <option value="">操作人</option>
+          <volist name=":get_admin_list()" id="vo">
+            <option value="{$vo.nickname}" <if condition="$vo.nickname eq I('adminname')">selected</if> >{$vo.nickname}</option>
+          </volist>
+        </select>
       </div>