fix:修改用户操作记录逻辑

controllers/user.go

@@ -168,6 +168,8 @@ func (this *UserController) Add() {
 
 	if user.Status == 2 {
 		userRecord := &models.UserChangeRecord{}
+		userRecord.UserId = user.UserId
+		userRecord.SysUserId = this.SysUser.SysUserId
 		userRecord.Content = this.SysUser.SysRealName + "新增用户"
 		userRecord.Insert()
 	}
@@ -299,6 +301,8 @@ func (this *UserController) Edit() {
 		return
 	}
 	record := &models.UserChangeRecord{}
+	record.UserId = req.UserId
+	record.SysUserId = this.SysUser.SysUserId
 	if user.Status == 2 {
 		record.Content = this.SysUser.SysRealName + "新增用户"
 	} else {
@@ -702,6 +706,8 @@ func (this *UserController) EditEnabled() {
 	}
 	// 记录操作
 	record := &models.UserChangeRecord{}
+	record.UserId = req.UserId
+	record.SysUserId = this.SysUser.SysUserId
 	if user.Status == 0 {
 		record.Content = this.SysUser.SysRealName + "禁用用户"
 	} else {
@@ -717,8 +723,7 @@ func (this *UserController) EditEnabled() {
 
 // @Title 用户信息变更记录
 // @Description 用户信息变更记录
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   UserId   query   int  true       "用户id"
 // @Success 200 操作成功
 // @router /change_list [get]
 func (this *UserController) ChangeList() {
@@ -728,7 +733,13 @@ func (this *UserController) ChangeList() {
 		this.ServeJSON()
 	}()
 
-	userRcord, err := models.GetUserChangeRecordList()
+	userId, _ := this.GetInt("UserId")
+	if userId <= 0 {
+		br.Msg = "用户信息错误"
+		return
+	}
+
+	userRcord, err := models.GetUserChangeRecordListById(userId)
 	if err != nil {
 		br.Msg = "用户信息变更查询失败"
 		br.ErrMsg = "用户信息变更查询失败，系统错误，Err:" + err.Error()

models/user.go

@@ -75,6 +75,8 @@ func SaveUser(user *User, chartPermissionIds []int) (err error) {
 		}
 		if user.UserId != 0 {
 			insertId = int64(user.UserId)
+		} else {
+			user.UserId = int(insertId)
 		}
 		// 先删除再增加
 		sql := `DELETE FROM user_chart_permission_mapping WHERE user_id=?`

models/user_change_record.go

@@ -8,6 +8,8 @@ import (
 
 type UserChangeRecord struct {
 	UserChangeRecordId int       `orm:"pk" description:"id"`
+	UserId             int       `description:"用户id"`
+	SysUserId          int       `description:"系统用户id"`
 	Content            string    `description:"内容"`
 	CreateTime         time.Time `description:"创建时间"`
 }
@@ -19,10 +21,10 @@ func (u *UserChangeRecord) Insert() (err error) {
 	return
 }
 
-func GetUserChangeRecordList() (items []*UserChangeRecord, err error) {
-	sql := `SELECT * FROM user_change_record ORDER BY create_time DESC `
+func GetUserChangeRecordListById(userId int) (items []*UserChangeRecord, err error) {
+	sql := `SELECT * FROM user_change_record WHERE user_id=? ORDER BY create_time DESC `
 	o := orm.NewOrmUsingDB("master")
-	_, err = o.Raw(sql).QueryRows(&items)
+	_, err = o.Raw(sql, userId).QueryRows(&items)
 	return
 }