theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix[litemall-admin]: 管理员角色名查询失败

Browse Source
This commit is contained in:
Junling Bu
2019-04-14 11:43:05 +08:00
parent 82a4a48394
commit 490ebfb045
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
litemall-admin/src/views/sys/role.vue
View File

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

6
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java
View File

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