瀏覽代碼

feature(优化): 获取我授权的省份

ZZH-wl 2 年之前
父節點
當前提交
e3915e6b9f
共有 2 個文件被更改,包括 46 次插入1 次删除
  1. 15 0
      opms_admin/app/handler/base_region_auth.go
  2. 31 1
      opms_admin/app/service/base_region_auth.go

+ 15 - 0
opms_admin/app/handler/base_region_auth.go

@@ -62,3 +62,18 @@ func (h *BaseRegionAuthHandler) GetRegionUsers(ctx context.Context, req *model.S
 	rsp.Data = g.Map{"list": list, "total": total}
 	return nil
 }
+
+// GetUserSalesProvince 获取用户销售省份
+func (h *BaseRegionAuthHandler) GetUserSalesProvince(ctx context.Context, nullParams interface{}, rsp *comm_def.CommonMsg) error {
+	regionService, err := service.NewRegionService(ctx)
+	if err != nil {
+		g.Log().Error(err)
+		return errors.New("系统异常,请重新尝试")
+	}
+	list, err := regionService.GetCurrentUserProvinceAuth()
+	if err != nil {
+		return err
+	}
+	rsp.Data = g.Map{"list": list}
+	return nil
+}

+ 31 - 1
opms_admin/app/service/base_region_auth.go

@@ -187,7 +187,7 @@ func (s *regionService) GetRegionUsers(req *model.SysUserSearchReq) (total int,
 	return
 }
 
-// 获取当前用户产品授权
+// 获取当前用户 地区授权
 func (s *regionService) getCurrentUserRegionAuth(userId ...int) ([]string, error) {
 	defaultUser := s.GetCxtUserId()
 	if len(userId) > 0 {
@@ -199,3 +199,33 @@ func (s *regionService) getCurrentUserRegionAuth(userId ...int) ([]string, error
 	}
 	return gconv.Strings(result), nil
 }
+
+// 获取当前用户地区省份授权
+func (s *regionService) GetCurrentUserProvinceAuth(userId ...int) (g.Map, error) {
+	defaultUser := s.GetCxtUserId()
+	if len(userId) > 0 {
+		defaultUser = userId[0]
+	}
+	authList, err := s.Dao.Where(s.Dao.C.UserId, defaultUser).Fields(s.Dao.C.ProvinceId, s.Dao.C.ProvinceName).Distinct().All()
+	if err != nil {
+		return nil, err
+	}
+	if len(authList) == 0 {
+		return nil, err
+	}
+	provinceList := make(g.ListStrStr, 0)
+	for _, v := range authList {
+		provinceList = append(provinceList, g.MapStrStr{
+			"id":         "auth" + gconv.String(v.ProvinceId),
+			"regionCode": gconv.String(v.ProvinceId),
+			"regionDesc": v.ProvinceName,
+		})
+	}
+	result := g.Map{
+		"id":         "auth99999999",
+		"regionCode": "99999999",
+		"regionDesc": "负责区域",
+		"children":   provinceList,
+	}
+	return result, nil
+}