diff --git a/cmd/internal/dao/artistInfo_user.go b/cmd/internal/dao/artistInfo_user.go index 3f4ec6e..e5ed8fd 100644 --- a/cmd/internal/dao/artistInfo_user.go +++ b/cmd/internal/dao/artistInfo_user.go @@ -287,7 +287,7 @@ func ArtistSupplyList(req *artistInfoUser.ArtistSupplyListRequest) (rep *artistI func UserLock(req *artistInfoUser.UserLockRequest) (rep *artistInfoUser.UserLockRespond, err error) { rep = &artistInfoUser.UserLockRespond{} - var tx = db.DB.Model(model.User{}).Begin() + var tx = db.DB.Begin().Model(model.User{}) switch { case req.Id != 0: tx = tx.Where("id = ?", req.Id) @@ -304,6 +304,10 @@ func UserLock(req *artistInfoUser.UserLockRequest) (rep *artistInfoUser.UserLock if req.IsLock { now = stime.TimeToString(time.Now(), stime.Format_Normal_YMDhms) } + var thisUser model.User + if err = tx.Find(&thisUser).Error; err != nil { + return nil, err + } if err = tx.Update("is_lock", req.IsLock).Update("latest_lock_time", now).Error; err != nil { zap.L().Error("get user info err", zap.Error(err)) err = errors.New(m.ERROR_SELECT) @@ -313,16 +317,16 @@ func UserLock(req *artistInfoUser.UserLockRequest) (rep *artistInfoUser.UserLock if !req.IsLock { // 解锁时与另外4个模块联动 - if err = db.DB.Model(model.ArtworkLockRecord{}).Where("artist_uid = ? AND status =2 ", req.ArtistUid).Update("status", 3).Error; err != nil { + if err = db.DB.Model(model.ArtworkLockRecord{}).Where("artist_uid = ? AND status =2 ", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil { return nil, err } - if err = db.DB.Model(model.ArtshowArtistSupplement{}).Where("artist_uid = ? AND status =2 ", req.ArtistUid).Update("status", 3).Error; err != nil { + if err = db.DB.Model(model.ArtshowArtistSupplement{}).Where("artist_uid = ? AND status =2 ", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil { return nil, err } - if err = db.DB.Model(model.ArtshowArtistIndex{}).Where("artist_uid = ? AND status =2 ", req.ArtistUid).Update("status", 3).Error; err != nil { + if err = db.DB.Model(model.ArtshowArtistIndex{}).Where("artist_uid = ? AND status =2 ", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil { return nil, err } - if err = db.DB.Model(model.ArtshowVideoRecord{}).Where("artist_uid = ? AND status =2 ", req.ArtistUid).Update("status", 3).Error; err != nil { + if err = db.DB.Model(model.ArtshowVideoRecord{}).Where("artist_uid = ? AND status =2 ", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil { return nil, err } } @@ -337,7 +341,6 @@ func CheckInvitedCode(req *artistInfoUser.CheckInvitedCodeRequest) (rep *artistI var user model.User if err = db.DB.First(&user, "invited_code = ?", req.InvitedCode).Error; err != nil { zap.L().Error("get user info err", zap.Error(err)) - err = errors.New(m.ERROR_SELECT) return nil, err } // rep. diff --git a/cmd/internal/dao/artistinfo_artshow_artistIndex.go b/cmd/internal/dao/artistinfo_artshow_artistIndex.go index c373b49..9b3d022 100644 --- a/cmd/internal/dao/artistinfo_artshow_artistIndex.go +++ b/cmd/internal/dao/artistinfo_artshow_artistIndex.go @@ -47,8 +47,7 @@ func (a artistinfoArtshowArtistIndex) CreateData(data *model.ArtshowArtistIndex, } func (a artistinfoArtshowArtistIndex) UpdateData(data *model.ArtshowArtistIndex) error { - return db.DB.Updates(&data).Error - + return db.DB.Where("id = ?", data.ID).Updates(&data).Error } func (a artistinfoArtshowArtistIndex) DeletedData(id ...int64) (err error) { @@ -89,6 +88,7 @@ func (a artistinfoArtshowArtistIndex) GetDataList(req *artistinfoArtshow.GetArti err = tx.Count(&total).Scopes(db.Pagination(req.Page, req.PageSize)).Find(&datas).Error return } + func (a artistinfoArtshowArtistIndex) Audit(auditStatus model.AuditStatus, mark1, mark2 string, ids ...int64) (err error) { tx := db.DB.Begin() err = tx.Model(model.ArtshowArtistIndex{}).Where("id in ?", ids).Update("audit_status", auditStatus).Error