Merge branch 'develop' of gitadmin/tuoheng_freeway into release

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

@@ -193,15 +193,12 @@ public class RoleServiceImpl implements IRoleService {
     @Override
     public JsonResult getRoleLists() {
         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("mark", MarkEnum.VALID.getCode());
         queryWrapper.orderByAsc("create_time");
         List<Role> rolesLists = roleMapper.selectList(queryWrapper);
-
         return JsonResult.success(rolesLists);
     }