diff --git a/api/version1/customerform/formTableList.go b/api/version1/customerform/formTableList.go index 05963db..9ebf2c3 100644 --- a/api/version1/customerform/formTableList.go +++ b/api/version1/customerform/formTableList.go @@ -70,7 +70,7 @@ func (a *ApiMethod) GainFormPageListContNew(c *gin.Context) { //获取表单数据 var formInfo modelAppPlatform.CustomerFormView - err = formInfo.GetCont(map[string]interface{}{"`cfid`": requestData.FormId, "`status`": 1}, "`tablekey`", "`table_structure`", "`mastesform`", "`mastesformjson`", "`listjson`", "`flowIsOpen`", "`flowkey`", "`groupid`", "`cfid`") + err = formInfo.GetCont(map[string]interface{}{"`cfid`": requestData.FormId, "`status`": 1}, "`tablekey`", "`table_structure`", "`mastesform`", "`mastesformjson`", "`listjson`", "`flowIsOpen`", "`flowkey`", "`groupid`", "`cfid`", "`signCode`") if err != nil { publicmethod.Result(1, err, c, "未知表单!无法获取字段!") return diff --git a/go.mod b/go.mod index 7e43d8a..84e3cb9 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,9 @@ module appPlatform //go 1.19 -go 1.24 +// go 1.24 +go 1.26 + require ( github.com/360EntSecGroup-Skylar/excelize v1.4.1 diff --git a/overall/publicmethod/getUserPower.go b/overall/publicmethod/getUserPower.go index f3d46f6..33d55c0 100644 --- a/overall/publicmethod/getUserPower.go +++ b/overall/publicmethod/getUserPower.go @@ -276,9 +276,9 @@ func (g *GainUserPower) MakeSearchSql(gormDb *gorm.DB, userCont modelshr.ManCont default: } if timeSet.IsTime { - gormDb = gormDb.Or("f.`creater` = ? AND ? BETWEEN ? AND ? ", userCont.Key, timeSet.TimeWord, timeSet.StartTime, timeSet.EndTime) + gormDb = gormDb.Or("f.`creater` = ? AND f.`states` = 1 AND ? BETWEEN ? AND ? ", userCont.Key, timeSet.TimeWord, timeSet.StartTime, timeSet.EndTime) } else { - gormDb = gormDb.Or("f.`creater` = ?", userCont.Key) + gormDb = gormDb.Or("f.`creater` = ? AND f.`states` = 1", userCont.Key) } return gormDb