支持职级降级的情况

zhangqian

2023-10-31 06c89f1e726e84c67abba6893d62abdd025b8791

支持职级降级的情况

 middleware/user.go

@@ -79,13 +79,17 @@
    fmt.Printf("Synced: %v, Message: %s", r.List, r.Message)

    for _, member := range r.List {
        err = model.NewUserSearch(nil).Upsert(model.User{
            UUID:       member.Uuid,
            Username:   member.Username,
            UserType:   constvar.UserType(member.Usertype),
            NickName:   member.Nickname,
            SubUserIds: strings.Join(member.SubUserIds, ","),
        })
        userRecord := model.User{
            UUID:     member.Uuid,
            Username: member.Username,
            UserType: constvar.UserType(member.Usertype),
            NickName: member.Nickname,
        }
        if member.SubUserIds != nil {
            subUserIds := strings.Join(member.SubUserIds, ",")
            userRecord.SubUserIds = &subUserIds
        }
        err = model.NewUserSearch(nil).Upsert(userRecord)
        if err != nil {
            logx.Errorf("sync user error: %v", err.Error())
            continue

 model/user.go

@@ -26,7 +26,7 @@
        MenuIds      []uint            `json:"menuIds" gorm:"-"`                              // 菜单ID列表
        AuthorityId  uint              `json:"authorityId" gorm:"default:888;comment:用户角色ID"` // 用户角色ID
        Authority    Authority         `json:"authority" gorm:"foreignKey:AuthorityId"`
        SubUserIds   string            `json:"subUserIds" gorm:"sub_user_ids"` //下属员工用户id,用逗号分开
        SubUserIds   *string           `json:"subUserIds" gorm:"sub_user_ids"` //下属员工用户id,用逗号分开
        gorm.Model   `json:"-"`
    }

@@ -303,7 +303,7 @@
    } else if old.Username != record.Username ||
        old.UserType != record.UserType ||
        old.NickName != record.NickName ||
        record.SubUserIds != "" && old.SubUserIds != record.SubUserIds {
        record.SubUserIds != nil && old.SubUserIds != record.SubUserIds {
        old.Username = record.Username
        old.UserType = record.UserType
        old.NickName = record.NickName