Browse Source

用户不存在不报错

xyxie 2 months ago
parent
commit
929a3ef8d5
2 changed files with 15 additions and 7 deletions
  1. 7 3
      controllers/chart_collect.go
  2. 8 4
      controllers/chart_info.go

+ 7 - 3
controllers/chart_collect.go

@@ -39,12 +39,17 @@ func (this *ChartCollectController) ClassifyList() {
 		br.Msg = "请选择商户"
 		return
 	}
-
+	resp := new(chart_collect.ChartCollectClassifyResp)
 	// 获取当前的客户信息
 	sysUser, err := models.GetUserByBusinessCodeAndMobile(businessCode, userMobile, userTelAreaCode)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "用户不存在"
+			items := make([]*chart_collect.ChartCollectClassifyItem, 0)
+			resp.List = items
+			br.Ret = 200
+			br.Success = true
+			br.Msg = "获取成功"
+			br.Data = resp
 			return
 		}
 		br.Msg = "获取用户信息失败"
@@ -59,7 +64,6 @@ func (this *ChartCollectController) ClassifyList() {
 		return
 	}
 
-	resp := new(chart_collect.ChartCollectClassifyResp)
 	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
 		items := make([]*chart_collect.ChartCollectClassifyItem, 0)
 		resp.List = items

+ 8 - 4
controllers/chart_info.go

@@ -256,12 +256,18 @@ func (this *ChartInfoController) UserChartList() {
 		currentIndex = 1
 	}
 	startSize = utils.StartIndex(currentIndex, pageSize)
-
+	allChartInfo := make([]*models.ChartInfo, 0)
+	page := paging.GetPaging(currentIndex, pageSize, 0)
 	// 获取用户信息和用户权限
 	userInfo, err := models.GetUserByBusinessCodeAndMobile(businessCode, userMobile, userTelAreaCode)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "用户不存在"
+			resp.ChartInfoList = allChartInfo
+			resp.Paging = page
+			br.Ret = 200
+			br.Success = true
+			br.Msg = "获取成功"
+			br.Data = resp
 			return
 		}
 		br.Msg = "获取用户信息失败"
@@ -280,8 +286,6 @@ func (this *ChartInfoController) UserChartList() {
 	condition := ""
 	pars := make([]interface{}, 0)
 
-	allChartInfo := make([]*models.ChartInfo, 0)
-	page := paging.GetPaging(currentIndex, pageSize, 0)
 	var total int64
 	if keyword != "" {
 		allChartInfo, total, err = services.EsSearchChartInfo(keyword, []int{}, []int{utils.CHART_SOURCE_DEFAULT}, permissionClassifyIds, startSize, pageSize)