diff --git a/core/core-backend/src/main/resources/ehcache/ehcache.xml b/core/core-backend/src/main/resources/ehcache/ehcache.xml index 43970fcf56..27b2096ef5 100644 --- a/core/core-backend/src/main/resources/ehcache/ehcache.xml +++ b/core/core-backend/src/main/resources/ehcache/ehcache.xml @@ -83,6 +83,11 @@ java.lang.Integer + + java.lang.String + java.util.List + + java.lang.String java.util.List diff --git a/de-xpack b/de-xpack index 34d3f25ca6..58b266c2c8 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 34d3f25ca633156eb59b3118137b90be2c8b36a6 +Subproject commit 58b266c2c89a305bcc14d3ea7a1f54f42deb665c diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java index ef8f65a606..368d726a98 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java @@ -9,6 +9,7 @@ import io.dataease.auth.DePermit; import io.dataease.auth.vo.TokenVO; import io.dataease.model.KeywordRequest; import io.dataease.request.BaseGridRequest; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -66,6 +67,7 @@ public interface UserApi { @PostMapping("/byCurOrg") List byCurOrg(@RequestBody KeywordRequest request); + @Hidden @GetMapping("/userCount") int userCount(); @@ -100,5 +102,7 @@ public interface UserApi { @PostMapping("/modifyPwd") void modifyPwd(@RequestBody ModifyPwdRequest request); - + @Hidden + @GetMapping("/firstEchelon/{limit}") + List firstEchelon(@PathVariable("limit") Long limit); } diff --git a/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java b/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java index a6d4e280fb..4fe29e928b 100644 --- a/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java +++ b/sdk/common/src/main/java/io/dataease/constant/CacheConstant.java @@ -3,6 +3,7 @@ package io.dataease.constant; public class CacheConstant { public static class UserCacheConstant { public static final String USER_COUNT_CACHE = "user_count"; + public static final String USER_ECHELON_CACHE = "user_echelon"; public static final String LOGIN_USER_CACHE = "login_user_cache"; public static final String USER_ROLES_CACHE = "user_roles"; public static final String USER_BUSI_PERS_CACHE = "user_busi_pers"; diff --git a/sdk/common/src/main/java/io/dataease/utils/AuthUtils.java b/sdk/common/src/main/java/io/dataease/utils/AuthUtils.java index f15d5e6447..c9eab2240a 100644 --- a/sdk/common/src/main/java/io/dataease/utils/AuthUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/AuthUtils.java @@ -29,7 +29,7 @@ public class AuthUtils { } public static boolean isSysAdmin(Long userId) { - return userId == SYS_ADMIN_UID; + return userId.equals(SYS_ADMIN_UID); }