diff --git a/src/bean/vo/response/log_management.go b/src/bean/vo/response/log_management.go index 2ccb30d7973b5679318685e611f79d64a492e6cb..337e10240bf5ccdb932148865cd269c6b58f1306 100644 --- a/src/bean/vo/response/log_management.go +++ b/src/bean/vo/response/log_management.go @@ -20,8 +20,8 @@ type LogManagementRep struct { } type SystemUserBehaviorList struct { - Xh int64 `json:"xh" xorm:"id"` - Id string `json:"id" xorm:"-"` // 主键id + //Xh int64 `json:"xh" xorm:"id"` + Id int `json:"id" xorm:"id"` // 主键id UserId int `json:"user_id"` // 系统用户id OrganizationId string `json:"organization_id"` // 组织uuid SystemModule string `json:"system_module"` // 系统模块 diff --git a/src/router/logmanagementrouter.go b/src/router/logmanagementrouter.go index ea7d1bd68871d573a18421d726829e86e08c6c43..4aa680ef9f70b1e90521f7da5ce4447b4aadd21d 100644 --- a/src/router/logmanagementrouter.go +++ b/src/router/logmanagementrouter.go @@ -20,7 +20,8 @@ func InitLogManagementRouter(e *gin.Engine) { systemLog.GET("log", controller.GetSystemLog) //系统日志 } - userBehavior := logger.Group("userBehavior", header.SetContext) + //userBehavior := logger.Group("userBehavior", header.SetContext) + userBehavior := logger.Group("userBehavior") { //用户行为审计: userBehavior.GET("list", controller.LogUserBehaviorList, header.AddLogMiddleware("用户行为审计", "/list", constant.OpTypeIntMap[constant.Find])) //用户行为审计列表 diff --git a/src/service/log_management.go b/src/service/log_management.go index b8f325633adbe253cbc5e7cb268a8053c49442cd..467f08ce2cf19fd25a77ebb6809854d54e26262f 100644 --- a/src/service/log_management.go +++ b/src/service/log_management.go @@ -107,8 +107,8 @@ func (s *LogManagement) LogUserBehaviorList(params *request.LogUserBehaviorListR } modelObj := db.Table("system_user_behavior").Alias("sub") modelObj.Join("INNER", []string{"system_user", "su"}, "sub.user_id = su.id") - modelObj.Join("INNER", []string{"system_organization_tree", "sot"}, "sot.organization_id = su.organization_id") - modelObj.Select("sub.*, su.system_account, su.phone, sot.name as org_name") + modelObj.Join("INNER", []string{"system_organization", "so"}, "so.organization_id = so.organization_id") + modelObj.Select("sub.*, su.system_account, su.phone, so.name as org_name") // 条件查询 if params.Search != "" { keyword := util.SpecialEscape(params.Search) @@ -204,8 +204,8 @@ func (s *LogManagement) LogUserBehaviorDetail(id string) (data *response.LogUser data = new(response.LogUserBehaviorDetailRep) modelObj := db.Table("system_user_behavior").Alias("sub") modelObj.Join("INNER", []string{"system_user", "su"}, "sub.user_id = su.id") - modelObj.Join("INNER", []string{"system_organization_tree", "sot"}, "sot.organization_id = su.organization_id") - modelObj.Select("sub.*, su.system_account, su.phone, sot.name as org_name") + modelObj.Join("INNER", []string{"system_organization", "so"}, "so.organization_id = su.organization_id") + modelObj.Select("sub.*, su.system_account, su.phone, so.name as org_name") _, err = modelObj.Where("sub.id = ?", id).And("sub.is_deleted = 0").Get(data) if err != nil { conf.Logger.Error("获取用户行为审计详情失败", zap.Error(err))