操作记录

app/business/controllers/AdminLogController.php

@@ -9,13 +9,12 @@ use yii\web\Controller;
 
 class AdminLogController extends BaseController
 {
-
+	
 	//日志列表 shish 2019.12.9
 	public function actionList()
 	{
 		$get = Yii::$app->request->get();
-		//组建where
-		$adminId = isset($get['adminId']) ? $get['adminId'] : -1;
+		$adminId = isset($get['adminId']) && !empty($get['adminId']) ? $get['adminId'] : -1;
 		$startTime = isset($get['startTime']) ? $get['startTime'] : '';
 		$endTime = isset($get['endTime']) ? $get['endTime'] : '';
 		$where = [];
@@ -24,10 +23,16 @@ class AdminLogController extends BaseController
 			$where['adminId'] = $adminId;
 		}
 		if (!empty($startTime) && !empty($endTime)) {
-
+			$startTime = strtotime($startTime);
+			$endTime = strtotime($endTime);
+			if ($startTime >= $endTime) {
+				util::fail('查询的结束要大于开始时间');
+			}
+			$endTime += 86399;
+			$where['addTime'] = ['between', [$startTime, $endTime]];
 		}
 		$list = AdminLogService::getLogList($where);
 		util::success($list);
 	}
-
+	
 }

biz/admin/classes/AdminLogClass.php

@@ -11,7 +11,21 @@ use biz\base\classes\BaseClass;
 
 class AdminLogClass extends BaseClass
 {
-
+	
 	public static $baseFile = '\biz\admin\models\AdminLog';
+	
+	public static function groupBaseInfo($list)
+	{
+		$adminIdList = array_column($list, 'adminId');
+		$adminIdList = array_unique(array_filter($adminIdList));
+		$adminList = AdminClass::getByIds($adminIdList, null, 'id');
+		foreach ($list as $key => $val) {
+			$adminId = $val['adminId'];
+			$ip = !empty($val['ip']) ? long2ip($val['ip']) : '';
+			$list[$key]['adminName'] = isset($adminList[$adminId]) ? $adminList[$adminId]['adminName'] : '';
+			$list[$key]['ip'] = $ip;
+		}
+		return $list;
+	}
 
 }

biz/admin/services/AdminLogService.php

@@ -26,6 +26,7 @@ class AdminLogService extends BaseService
 		if (empty($list)) {
 			return $data;
 		}
+		$data['list'] = AdminLogClass::groupBaseInfo($list);
 		return $data;
 	}