From 4a0980a5d393f6b78961d221d45a1951eb1bd51e Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 25 Jun 2021 17:51:38 +0800 Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop --- gc-shop/src/main/java/com/xzx/gc/shop/service/ScoreDetailsService.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/ScoreDetailsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/ScoreDetailsService.java index f6e7981..a002286 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/service/ScoreDetailsService.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/ScoreDetailsService.java @@ -1,8 +1,10 @@ package com.xzx.gc.shop.service; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.xzx.gc.common.utils.StringUtils; import com.xzx.gc.shop.dto.QueryScoreDetailsListDto; import com.xzx.gc.shop.mapper.ScoreDetailsMapper; import com.xzx.gc.shop.vo.QueryOrderListVo; @@ -27,6 +29,12 @@ public Map<String, Object> queryScoreDetailsList(QueryScoreDetailsListDto model) { PageHelper.startPage(model.getPage(), model.getLimit()); List<QueryScoreDetailsListVo> maps = scoreDetailsMapper.queryScoreDetailsList(model); + if(CollUtil.isNotEmpty(maps)){ + for(QueryScoreDetailsListVo queryScoreDetailsListVo : maps){ + String decode = StringUtils.decode(queryScoreDetailsListVo.getName()); + queryScoreDetailsListVo.setName(decode); + } + } PageInfo pageInfo = new PageInfo(maps); int count = Convert.toInt(pageInfo.getTotal()); Map<String, Object> map = new HashMap<>(); -- Gitblit v1.9.1