From c295f5a839989b2c7ec08ac9bb09e2d85e0d4bff Mon Sep 17 00:00:00 2001 From: zhh Date: Wed, 16 May 2018 09:13:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/macro/mall/config/SecurityConfig.java | 4 ++-- mall-admin/src/main/java/com/macro/mall/dto/CommonResult.java | 4 ++-- .../java/com/macro/mall/service/impl/PmsBrandServiceImpl.java | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mall-admin/src/main/java/com/macro/mall/config/SecurityConfig.java b/mall-admin/src/main/java/com/macro/mall/config/SecurityConfig.java index 8d4bc96..c441975 100644 --- a/mall-admin/src/main/java/com/macro/mall/config/SecurityConfig.java +++ b/mall-admin/src/main/java/com/macro/mall/config/SecurityConfig.java @@ -65,8 +65,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .permitAll() .antMatchers(HttpMethod.OPTIONS)//跨域请求会先进行一次options请求 .permitAll() -// .antMatchers("/**")//测试时全部运行访问 -// .permitAll() + .antMatchers("/**")//测试时全部运行访问 + .permitAll() .anyRequest()// 除上面外的所有请求全部需要鉴权认证 .authenticated(); // 禁用缓存 diff --git a/mall-admin/src/main/java/com/macro/mall/dto/CommonResult.java b/mall-admin/src/main/java/com/macro/mall/dto/CommonResult.java index 1a9a8b1..ec249c5 100644 --- a/mall-admin/src/main/java/com/macro/mall/dto/CommonResult.java +++ b/mall-admin/src/main/java/com/macro/mall/dto/CommonResult.java @@ -44,10 +44,10 @@ public class CommonResult { */ public CommonResult pageSuccess(List data) { PageInfo pageInfo = new PageInfo(data); - long totalPage = pageInfo.getTotal() / pageInfo.getPageSize(); Map result = new HashMap<>(); result.put("pageSize", pageInfo.getPageSize()); - result.put("totalPage", totalPage+1); + result.put("totalPage", pageInfo.getPages()); + result.put("total", pageInfo.getTotal()); result.put("pageNum", pageInfo.getPageNum()); result.put("list", pageInfo.getList()); this.code = SUCCESS; diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/PmsBrandServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/PmsBrandServiceImpl.java index db74a06..4245a45 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/impl/PmsBrandServiceImpl.java +++ b/mall-admin/src/main/java/com/macro/mall/service/impl/PmsBrandServiceImpl.java @@ -79,7 +79,6 @@ public class PmsBrandServiceImpl implements PmsBrandService { PmsBrandExample pmsBrandExample = new PmsBrandExample(); pmsBrandExample.setOrderByClause("sort desc"); PmsBrandExample.Criteria criteria = pmsBrandExample.createCriteria(); - criteria.andShowStatusEqualTo(1); if (!StringUtils.isEmpty(keyword)) { criteria.andNameLike("%" + keyword + "%"); }