Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/V1.3.3
wanjing 10 months ago
parent
commit
d7dda19b7e
1 changed files with 2 additions and 5 deletions
  1. +2
    -5
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/role/RoleServiceImpl.java

+ 2
- 5
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/role/RoleServiceImpl.java View File

@Override @Override
public JsonResult getRoleLists() { public JsonResult getRoleLists() {
QueryWrapper<Role> queryWrapper = new QueryWrapper<>(); QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
// 租户ID
//不展示超管
queryWrapper.ne("code", "001");
// queryWrapper.eq("tenant_id", CurrentUserUtil.getTenantId());
queryWrapper.ne("code", "001"); // 不展示超管
queryWrapper.eq("tenant_id", CurrentUserUtil.getTenantId());
queryWrapper.eq("status", 1); queryWrapper.eq("status", 1);
queryWrapper.eq("mark", MarkEnum.VALID.getCode()); queryWrapper.eq("mark", MarkEnum.VALID.getCode());
queryWrapper.orderByAsc("create_time"); queryWrapper.orderByAsc("create_time");
List<Role> rolesLists = roleMapper.selectList(queryWrapper); List<Role> rolesLists = roleMapper.selectList(queryWrapper);

return JsonResult.success(rolesLists); return JsonResult.success(rolesLists);
} }



Loading…
Cancel
Save