aa

business/jxstore/cms/permission.go

@@ -82,32 +82,22 @@ func UpdateMenu(ctx *jxcontext.Context, menuID int, payload map[string]interface
 	return num, err
 }
 
-type GetRoleResult struct {
-	Role     *model.Role
-	CityInfo []*model.Place `json:"cityInfo"`
-	Stores   []*model.Store `json:"storeInfo"`
-}
-
-func GetRole(ctx *jxcontext.Context, name string) (getRoleResults []*GetRoleResult, err error) {
+func GetRole(ctx *jxcontext.Context, name string) (roles []*model.Role, err error) {
 	var (
 		db = dao.GetDB()
 	)
 	roles, err := dao.GetRole(db, name, "")
 	for _, v := range roles {
-		getRoleResult := &GetRoleResult{
-			Role: v,
-		}
 		if v.CityCodes != "" {
 			if cityInfos, err := dao.GetPlaces(db, jxutils.StrListToIntList(strings.Split(v.CityCodes, ","))); err == nil {
-				getRoleResult.CityInfo = cityInfos
+				v.CityInfo = cityInfos
 			}
 		}
 		if v.StoreIDs != "" {
 			if stores, err := dao.GetStoreList(db, jxutils.StrListToIntList(strings.Split(v.StoreIDs, ",")), nil, nil, nil, nil, ""); err == nil {
-				getRoleResult.Stores = stores
+				v.Stores = stores
 			}
 		}
-		getRoleResults = append(getRoleResults, getRoleResult)
 	}
 	return getRoleResults, err
 }