Merge branch 'feature_sync' of 101.201.121.115:leo/LAPP_GAAS_GFrame_BACKEND into feature_sync

task/scheduler.go

@@ -19,10 +19,10 @@ import (
 func Start() error {
 	c := cron.New()
 	var err error
-	//err = c.AddFunc("*/5 * * * * ?", TransferArtDemandToPortal)
-	//if err != nil {
-	//	return err
-	//}
+	err = c.AddFunc("*/5 * * * * ?", TransferArtDemandToPortal)
+	if err != nil {
+		return err
+	}
 	err = c.AddFunc("*/5 * * * * ?", CreateParseFromDBTask)
 	if err != nil {
 		return err

web/controllers/log/ArtDemandLst.rest.go

@@ -3,6 +3,7 @@
 package log
 
 import (
+	common "LAPP_GAAS_GFrame_BACKEND/models/base"
 	model "LAPP_GAAS_GFrame_BACKEND/models/log"
 	"LAPP_GAAS_GFrame_BACKEND/utils"
 	"LAPP_GAAS_GFrame_BACKEND/web/middleware/jwts"
@@ -586,8 +587,11 @@ func RegisterSelectLastModify(party router.Party, path string, method func(int)
 func RegisterSyncHronousData(party router.Party, httpMethod string, path string, method func(int, string) error) {
 
 	party.Handle(httpMethod, path, func(ctx iris.Context) {
-		plantNr, _ := ctx.URLParamInt("plantNr")
-
+		plant := ctx.FormValue("plantNr")
+		plantNr := utils.ValueToInt(plant,0)
+		if utils.ValueIsEmpty(plantNr){
+			plantNr = common.PlantNr
+		}
 		var err error = nil
 		//获取通过iris.WithPostMaxMemory获取的最大上传值大小。
 		maxSize := ctx.Application().ConfigurationReadOnly().GetPostMaxMemory()