This commit is contained in:
2024-04-08 17:41:05 +08:00
parent 1dde3de9fa
commit 57fe832e38
21 changed files with 7917 additions and 10930 deletions
+2 -2
View File
@@ -50,7 +50,7 @@ func (a *ItemIconGroup) GetList(c *gin.Context) {
groups := []models.ItemIconGroup{}
err := global.Db.Transaction(func(tx *gorm.DB) error {
if err := tx.Order("sort ,created_at").Where("user_id=?", userInfo.ID).Find(&groups).Error; err != nil {
if err := tx.Order("sort ,created_at").Find(&groups).Error; err != nil {
apiReturn.ErrorDatabase(c, err.Error())
return err
}
@@ -68,7 +68,7 @@ func (a *ItemIconGroup) GetList(c *gin.Context) {
}
// 并将当前账号下所有无分组的图标更新到当前组
if err := tx.Model(&models.ItemIcon{}).Where("user_id=?", userInfo.ID).Update("item_icon_group_id", defaultGroup.ID).Error; err != nil {
if err := tx.Model(&models.ItemIcon{}).Update("item_icon_group_id", defaultGroup.ID).Error; err != nil {
apiReturn.ErrorDatabase(c, err.Error())
return err
}
+2 -2
View File
@@ -131,10 +131,10 @@ func (a *ItemIcon) GetListByGroupId(c *gin.Context) {
return
}
userInfo, _ := base.GetCurrentUserInfo(c)
// userInfo, _ := base.GetCurrentUserInfo(c)
itemIcons := []models.ItemIcon{}
if err := global.Db.Order("sort ,created_at").Find(&itemIcons, "item_icon_group_id = ? AND user_id=?", req.ItemIconGroupId, userInfo.ID).Error; err != nil {
if err := global.Db.Order("sort ,created_at").Find(&itemIcons, "item_icon_group_id = ? ", req.ItemIconGroupId).Error; err != nil {
apiReturn.ErrorDatabase(c, err.Error())
return
}
+2 -2
View File
@@ -16,9 +16,9 @@ type UserConfig struct {
}
func (a *UserConfig) Get(c *gin.Context) {
userInfo, _ := base.GetCurrentUserInfo(c)
// userInfo, _ := base.GetCurrentUserInfo(c)
cfg := models.UserConfig{}
if err := global.Db.First(&cfg, "user_id=?", userInfo.ID).Error; err != nil {
if err := global.Db.First(&cfg).Error; err != nil {
if err == gorm.ErrRecordNotFound {
apiReturn.ErrorDataNotFound(c)
return