From 134d56cde863cbdae2010f4707d265df6b4e07bb Mon Sep 17 00:00:00 2001 From: limin Date: Fri, 17 Jan 2025 15:12:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E4=B8=8D=E6=88=90=E5=8A=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/application/ApplicationServiceImpl.java | 2 +- .../yudao/module/system/api/user/AdminUserApi.java | 7 +++++++ .../module/system/api/user/AdminUserApiImpl.java | 11 +++++++---- .../module/system/service/user/AdminUserService.java | 2 ++ .../system/service/user/AdminUserServiceImpl.java | 11 +++++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java index 3533d45ea..82f265775 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java @@ -162,7 +162,7 @@ public class ApplicationServiceImpl implements ApplicationService { PageResult applicationDOPageResult = applicationMapper.selectPage(pageReqVO); PageResult result = BeanUtils.toBean(applicationDOPageResult, ApplicationRespVO.class); List ids = applicationDOPageResult.getList().stream().map(applicationDO -> Long.parseLong(applicationDO.getCreator())).collect(Collectors.toList()); - Map userMap = adminUserApi.getUserMap(ids); + Map userMap = adminUserApi.getUserMapApplication(ids); for (ApplicationRespVO applicationRespVO : result.getList()) { applicationRespVO.setCreatorName(userMap.get(Long.parseLong(applicationRespVO.getCreator())).getNickname()); } diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java index 4a7bc7aad..95b6d7804 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java @@ -87,4 +87,11 @@ public interface AdminUserApi { void validateUserList(Collection ids); Long getUserNumber(); + + default Map getUserMapApplication(List ids){ + List users = getUserListApplication(ids); + return CollectionUtils.convertMap(users, AdminUserRespDTO::getId); + } + + List getUserListApplication(List ids); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java index 1a65c0f10..0136bc8a4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java @@ -12,10 +12,7 @@ import cn.iocoder.yudao.module.system.service.user.AdminUserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Set; +import java.util.*; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; @@ -87,4 +84,10 @@ public class AdminUserApiImpl implements AdminUserApi { return userService.getUserNumber(); } + @Override + public List getUserListApplication(List ids) { + List users = userService.getUserListApplication(ids); + return BeanUtils.toBean(users, AdminUserRespDTO.class); + } + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java index c51802a68..f97a1f869 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java @@ -219,4 +219,6 @@ public interface AdminUserService { boolean isPasswordMatch(String rawPassword, String encodedPassword); Long getUserNumber(); + + List getUserListApplication(List ids); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index d86a29506..f55181b56 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -10,6 +10,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; +import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils; import cn.iocoder.yudao.module.infra.api.config.ConfigApi; import cn.iocoder.yudao.module.infra.api.file.FileApi; @@ -553,6 +554,15 @@ public class AdminUserServiceImpl implements AdminUserService { return aLong; } + @Override + @DataPermission(enable = false) + public List getUserListApplication(List ids) { + if (CollUtil.isEmpty(ids)) { + return Collections.emptyList(); + } + return userMapper.selectBatchIds(ids); + } + /** * 对密码进行加密 * @@ -563,4 +573,5 @@ public class AdminUserServiceImpl implements AdminUserService { return passwordEncoder.encode(password); } + }