|
|
@@ -957,9 +957,9 @@ func GetHsbyProvincesAndCities(provinceID int) ([]Division, error) {
|
|
|
divisions := make([]Division, 0)
|
|
|
session := engine.Where("DIVISIONLEVEL = 'province' or DIVISIONLEVEL = 'city'").
|
|
|
And(`AUTOID in (
|
|
|
- (select DESCPROVINCEID AUTOID from HSBY_GOODSEX inner join GOODS on GOODS.GOODSID = HSBY_GOODSEX.GOODSID and GOODS.GOODSSTATUS = 3)
|
|
|
+ (select DESCPROVINCEID AUTOID from HSBY_GOODSEX inner join GOODS on GOODS.GOODSID = HSBY_GOODSEX.GOODSID and GOODS.GOODSSTATUS in (2,3))
|
|
|
union all
|
|
|
- (select DESCCITYID AUTOID from HSBY_GOODSEX inner join GOODS on GOODS.GOODSID = HSBY_GOODSEX.GOODSID and GOODS.GOODSSTATUS = 3)
|
|
|
+ (select DESCCITYID AUTOID from HSBY_GOODSEX inner join GOODS on GOODS.GOODSID = HSBY_GOODSEX.GOODSID and GOODS.GOODSSTATUS in (2,3))
|
|
|
)`)
|
|
|
if provinceID > 0 {
|
|
|
session = session.And("AUTOID = ?", provinceID)
|