From 490ebfb0451411345e59637f53c8c45880a8f7a0 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sun, 14 Apr 2019 11:43:05 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-admin]:=20=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E8=A7=92=E8=89=B2=E5=90=8D=E6=9F=A5=E8=AF=A2=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin/src/views/sys/role.vue                       | 2 +-
 .../linlinjava/litemall/db/service/LitemallRoleService.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/litemall-admin/src/views/sys/role.vue b/litemall-admin/src/views/sys/role.vue
index 5b703c85..2c52f81a 100644
--- a/litemall-admin/src/views/sys/role.vue
+++ b/litemall-admin/src/views/sys/role.vue
@@ -3,7 +3,7 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.rolename" clearable class="filter-item" style="width: 200px;" placeholder="请输入角色名称"/>
+      <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 200px;" placeholder="请输入角色名称"/>
       <el-button v-permission="['GET /admin/role/list']" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button v-permission="['POST /admin/role/create']" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">添加</el-button>
     </div>
diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java
index 9e0c421e..ede69ade 100644
--- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java
+++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java
@@ -37,12 +37,12 @@ public class LitemallRoleService {
 
     }
 
-    public List<LitemallRole> querySelective(String roleName, Integer page, Integer size, String sort, String order) {
+    public List<LitemallRole> querySelective(String name, Integer page, Integer size, String sort, String order) {
         LitemallRoleExample example = new LitemallRoleExample();
         LitemallRoleExample.Criteria criteria = example.createCriteria();
 
-        if (!StringUtils.isEmpty(roleName)) {
-            criteria.andNameEqualTo("%" + roleName + "%");
+        if (!StringUtils.isEmpty(name)) {
+            criteria.andNameLike("%" + name + "%");
         }
         criteria.andDeletedEqualTo(false);