Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/role/RoleServiceImpl.java

@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-
 /**
  * @Author ChengWang
  * @Date 2022/12/16
@@ -78,12 +77,11 @@ public class RoleServiceImpl implements IRoleService {
         IPage<Role> page = new Page<>(roleQuery.getPage(), roleQuery.getLimit());
         // 查询条件
         QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
-        // 租户ID
-//        queryWrapper.eq("tenant_id", CurrentUserUtil.getTenantId());
         // 角色名称
-        if (!StringUtils.isEmpty(roleQuery.getRoleName())) {
+        if (StringUtils.isNotEmpty(roleQuery.getRoleName())) {
             queryWrapper.like("role_name", roleQuery.getRoleName());
         }
+        queryWrapper.eq("tenant_id", CurrentUserUtil.getTenantId());
         queryWrapper.eq("mark", MarkEnum.VALID.getCode());
         //queryWrapper.orderByAsc("sort");
         queryWrapper.orderByAsc("create_time");
@@ -92,7 +90,6 @@ public class RoleServiceImpl implements IRoleService {
         IPage<Role> pageData = roleMapper.selectPage(page, queryWrapper);
         pageData.convert(x -> {
             RoleListVo roleListVo = Convert.convert(RoleListVo.class, x);
-            // TODO...
             return roleListVo;
         });
         return JsonResult.success(pageData);