From e771ff72ce0b45a90850e39c99aa8ad31c457c4d Mon Sep 17 00:00:00 2001 From: yangduo Date: Fri, 16 Aug 2024 11:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adminserver/api/v1/system/announcement.go | 18 +++++++++--------- server/adminserver/api/v1/system/audit.go | 18 +++++++++--------- server/adminserver/router/system/sys_annc.go | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/server/adminserver/api/v1/system/announcement.go b/server/adminserver/api/v1/system/announcement.go index 6b83692a..1c796a5f 100644 --- a/server/adminserver/api/v1/system/announcement.go +++ b/server/adminserver/api/v1/system/announcement.go @@ -164,17 +164,17 @@ func (this *AnncApi) UpdateAnnc(c *gin.Context) { return } - db.Table(annc.TableName()).Where("idx != ?", idx).Where("annc_type = ?", annc.AnncType).Where("platform = ?", annc.PlatForm).Count(&count) - if count > 0 { - c.JSON(http.StatusOK, gin.H{ - "code": 1, - "message": "已有同类型的公告", - }) - return - } + // db.Table(annc.TableName()).Where("idx != ?", idx).Where("annc_type = ?", annc.AnncType).Where("platform = ?", annc.PlatForm).Count(&count) + // if count > 0 { + // c.JSON(http.StatusOK, gin.H{ + // "code": 1, + // "message": "已有同类型的公告", + // }) + // return + // } annc.ModifyTime = int32(f5.GetApp().GetRealSeconds()) - err := db.Select("*").Omit("idx", "createtime").Where("idx = ?", idx).Updates(&annc).Error + err := db.Select("*").Omit("idx", "createtime", "annc_type", "platform").Where("idx = ?", idx).Updates(&annc).Error if err != nil { c.JSON(http.StatusOK, gin.H{ "code": 1, diff --git a/server/adminserver/api/v1/system/audit.go b/server/adminserver/api/v1/system/audit.go index ce352aeb..ca74a879 100644 --- a/server/adminserver/api/v1/system/audit.go +++ b/server/adminserver/api/v1/system/audit.go @@ -118,16 +118,16 @@ func (this *AuditApi) UpdateAudit(c *gin.Context) { return } - db.Table(audit.TableName()).Where("idx != ?", idx).Where("model = ?", audit.Model).Count(&count) - if count > 0 { - c.JSON(http.StatusOK, gin.H{ - "code": 1, - "message": "已有同类型审核", - }) - return - } + // db.Table(audit.TableName()).Where("idx != ?", idx).Where("model = ?", audit.Model).Count(&count) + // if count > 0 { + // c.JSON(http.StatusOK, gin.H{ + // "code": 1, + // "message": "已有同类型审核", + // }) + // return + // } - err := db.Select("*").Omit("idx").Where("idx = ?", idx).Updates(&audit).Error + err := db.Select("*").Omit("idx", "model").Where("idx = ?", idx).Updates(&audit).Error if err != nil { c.JSON(http.StatusOK, gin.H{ "code": 1, diff --git a/server/adminserver/router/system/sys_annc.go b/server/adminserver/router/system/sys_annc.go index 5e06f508..fcb9366a 100644 --- a/server/adminserver/router/system/sys_annc.go +++ b/server/adminserver/router/system/sys_annc.go @@ -15,7 +15,7 @@ func (this *AnncRouter) InitAnncRouter(priRouter *gin.RouterGroup) { anncApi.Init() { priUserRouter.GET("anncList", middleware.Permission("api/v1/annc/anncList", anncApi.AnncList)) - priUserRouter.POST("addAnnc", middleware.Permission("api/v1/annc/addAnnc", anncApi.AddAnnc)) + // priUserRouter.POST("addAnnc", middleware.Permission("api/v1/annc/addAnnc", anncApi.AddAnnc)) priUserRouter.PUT("updateAnnc/:idx", middleware.Permission("api/v1/annc/updateAnnc", anncApi.UpdateAnnc)) priUserRouter.GET("anncIngameList", middleware.Permission("api/v1/annc/anncIngameList", anncApi.IngameAnncList))