diff --git a/build/artShowServerProd b/build/artShowServerProd index 111b89b..5ac3d9c 100644 Binary files a/build/artShowServerProd and b/build/artShowServerProd differ diff --git a/cmd/dao/sale_address.go b/cmd/dao/sale_address.go index b3da053..461490e 100644 --- a/cmd/dao/sale_address.go +++ b/cmd/dao/sale_address.go @@ -8,7 +8,14 @@ import ( func QuerySaleAddress(in *artShow.SaleAddressReq) (out []*model.SaleAddress, err error) { out = make([]*model.SaleAddress, 0) - err = db.DbArtShow.Table("sale_address").Where("parent_name = ? ", in.ParentName).Find(&out).Error + queryDB := db.DbArtShow.Table("sale_address") + + if in.ParentName == "-1" { + err = queryDB.Where("parent_name <> '0' ").Find(&out).Error + } else { + err = queryDB.Where("parent_name = ? ", in.ParentName).Find(&out).Error + } + if err != nil { return nil, err } diff --git a/pkg/db/init.go b/pkg/db/init.go index 674b2e9..2431aeb 100644 --- a/pkg/db/init.go +++ b/pkg/db/init.go @@ -37,7 +37,7 @@ func Init(confPath string) { LoadMysqlData(file) //MySQL数据库 - path := strings.Join([]string{DbUser, ":", DbPassWord, "@tcp(", DbHost, ":", DbPort, ")/", DbName, "?charset=utf8&parseTime=true"}, "") + path := strings.Join([]string{DbUser, ":", DbPassWord, "@tcp(", DbHost, ":", DbPort, ")/", DbName, "?charset=utf8&parseTime=true&loc=Local"}, "") //连接数据库 Database(path) //migration() //迁移表 按需打开