From 5421f9d925a15eddfcaf356839ee1a180b36689a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 25 八月 2023 14:01:35 +0800
Subject: [PATCH] Merge branch 'hotfix'
---
service/province.go | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/service/province.go b/service/province.go
index 75cc20c..533c9f4 100644
--- a/service/province.go
+++ b/service/province.go
@@ -45,13 +45,21 @@
return ecode.OK
}
-func (ProvinceService) GetProvinces() ([]*model.Province, int) {
- list, err := model.NewProvinceSearch(nil).FindAll()
- if err != nil {
- return nil, ecode.ProvinceGetListErr
+func (ProvinceService) GetProvinces(countryId int) ([]*model.Province, int) {
+ // get province list
+ if countryId != 0 {
+ list, err := model.NewProvinceSearch(nil).SetCountryId(countryId).FindAll()
+ if err != nil {
+ return nil, ecode.ProvinceNotExist
+ }
+ return list, ecode.OK
+ } else {
+ list, err := model.NewProvinceSearch(nil).FindAll()
+ if err != nil {
+ return nil, ecode.ProvinceNotExist
+ }
+ return list, ecode.OK
}
-
- return list, ecode.OK
}
func (ProvinceService) SetProvinces(countryId int, list []int) int {
--
Gitblit v1.8.0