merge: 合并代码20241228

This commit is contained in:
TsMask committed 2024-12-28 15:36:47 +08:00
1 parent 6b4633fa5e
commit 33cbaeb1cd
69 files changed
+2546 -1951

No files matched your search

+1 -1
View File
@@ -174,7 +174,7 @@ func (k *KpiCTitle) Post(c *gin.Context) {
}
userName := ctx.LoginUserToUserName(c)
title.CreatedBy = &userName
result := dborm.DefaultDB().Where("ne_type=? and (kpi_id=? or title=?)", title.NeType, title.KpiID, title.Title).First(&title)
result := dborm.DefaultDB().Where("ne_type=? and (kpi_id=? or title=?) and status!='Deleted'", title.NeType, title.KpiID, title.Title).First(&title)
if result.RowsAffected > 0 {
c.JSON(http.StatusOK, services.ErrResp("custom indicator already exist"))
return