DATA_MIDDLE_PLATFORM/Data_Middle_Platform_Server
3
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

修复查询创建人不成功问题

Browse Source
This commit is contained in:
limin 2025-01-17 15:12:49 +08:00
parent a86a3485f7
commit 134d56cde8
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java
View File

@ -162,7 +162,7 @@ public class ApplicationServiceImpl implements ApplicationService {
PageResult<ApplicationDO> applicationDOPageResult = applicationMapper.selectPage(pageReqVO);
PageResult<ApplicationRespVO> result = BeanUtils.toBean(applicationDOPageResult, ApplicationRespVO.class);
List<Long> ids = applicationDOPageResult.getList().stream().map(applicationDO -> Long.parseLong(applicationDO.getCreator())).collect(Collectors.toList());
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(ids);
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMapApplication(ids);
for (ApplicationRespVO applicationRespVO : result.getList()) {
applicationRespVO.setCreatorName(userMap.get(Long.parseLong(applicationRespVO.getCreator())).getNickname());
}

7
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
View File

@ -87,4 +87,11 @@ public interface AdminUserApi {
void validateUserList(Collection<Long> ids);
Long getUserNumber();
default Map<Long, AdminUserRespDTO> getUserMapApplication(List<Long> ids){
List<AdminUserRespDTO> users = getUserListApplication(ids);
return CollectionUtils.convertMap(users, AdminUserRespDTO::getId);
}
List<AdminUserRespDTO> getUserListApplication(List<Long> ids);
}

11
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
View File

@ -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<AdminUserRespDTO> getUserListApplication(List<Long> ids) {
List<AdminUserDO> users = userService.getUserListApplication(ids);
return BeanUtils.toBean(users, AdminUserRespDTO.class);
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
View File

@ -219,4 +219,6 @@ public interface AdminUserService {
boolean isPasswordMatch(String rawPassword, String encodedPassword);
Long getUserNumber();
List<AdminUserDO> getUserListApplication(List<Long> ids);
}

11
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
View File

@ -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<AdminUserDO> getUserListApplication(List<Long> 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);
}
}