日期区分用户和管理员

internal/db/models/log_dao.go

@@ -58,7 +58,7 @@ func (this *LogDAO) CreateLog(adminType string, adminId int64, level string, des
 }
 
 // 计算所有日志数量
-func (this *LogDAO) CountLogs(dayFrom string, dayTo string, keyword string) (int64, error) {
+func (this *LogDAO) CountLogs(dayFrom string, dayTo string, keyword string, userType string) (int64, error) {
 	dayFrom = this.formatDay(dayFrom)
 	dayTo = this.formatDay(dayTo)
 
@@ -75,11 +75,19 @@ func (this *LogDAO) CountLogs(dayFrom string, dayTo string, keyword string) (int
 			Param("keyword", "%"+keyword+"%")
 	}
 
+	// 用户类型
+	switch userType {
+	case "admin":
+		query.Where("adminId>0")
+	case "user":
+		query.Where("userId>0")
+	}
+
 	return query.Count()
 }
 
 // 列出单页日志
-func (this *LogDAO) ListLogs(offset int64, size int64, dayFrom string, dayTo string, keyword string) (result []*Log, err error) {
+func (this *LogDAO) ListLogs(offset int64, size int64, dayFrom string, dayTo string, keyword string, userType string) (result []*Log, err error) {
 	dayFrom = this.formatDay(dayFrom)
 	dayTo = this.formatDay(dayTo)
 
@@ -95,6 +103,14 @@ func (this *LogDAO) ListLogs(offset int64, size int64, dayFrom string, dayTo str
 			Param("keyword", "%"+keyword+"%")
 	}
 
+	// 用户类型
+	switch userType {
+	case "admin":
+		query.Where("adminId>0")
+	case "user":
+		query.Where("userId>0")
+	}
+
 	_, err = query.
 		Offset(offset).
 		Limit(size).

internal/rpc/services/service_log.go

@@ -35,7 +35,7 @@ func (this *LogService) CountLogs(ctx context.Context, req *pb.CountLogRequest)
 		return nil, err
 	}
 
-	count, err := models.SharedLogDAO.CountLogs(req.DayFrom, req.DayTo, req.Keyword)
+	count, err := models.SharedLogDAO.CountLogs(req.DayFrom, req.DayTo, req.Keyword, req.UserType)
 	if err != nil {
 		return nil, err
 	}
@@ -50,7 +50,7 @@ func (this *LogService) ListLogs(ctx context.Context, req *pb.ListLogsRequest) (
 		return nil, err
 	}
 
-	logs, err := models.SharedLogDAO.ListLogs(req.Offset, req.Size, req.DayFrom, req.DayTo, req.Keyword)
+	logs, err := models.SharedLogDAO.ListLogs(req.Offset, req.Size, req.DayFrom, req.DayTo, req.Keyword, req.UserType)
 	if err != nil {
 		return nil, err
 	}