|
@@ -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)
|