by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: by2025:5603edb1fcd594d0415493141c88f0891762df76
Branches Tags
by2025:master
by2025:main
..
compare: by2025:d8d01b7d380947e1b6ce76485bc84a9dd4a692e3
Branches Tags
by2025:master
by2025:main

No commits in common. "5603edb1fcd594d0415493141c88f0891762df76" and "d8d01b7d380947e1b6ce76485bc84a9dd4a692e3" have entirely different histories.
5603edb1fc ... d8d01b7d38

1 changed files with 2 additions and 10 deletions
Show Stats Expand all files Collapse all files

12
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ApplicationServiceImpl.java
View File

@ -22,8 +22,6 @@ import org.dromara.property.domain.Application;
import org.dromara.property.mapper.ApplicationMapper; import org.dromara.property.mapper.ApplicationMapper;
import org.dromara.property.service.IApplicationService; import org.dromara.property.service.IApplicationService;
import java.sql.Array;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection; import java.util.Collection;
@ -70,14 +68,8 @@ public class ApplicationServiceImpl implements IApplicationService {
public TableDataInfo<ApplicationVo> queryPageList(ApplicationBo bo, PageQuery pageQuery) { public TableDataInfo<ApplicationVo> queryPageList(ApplicationBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Application> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<Application> lqw = buildQueryWrapper(bo);
Page<ApplicationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<ApplicationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
ArrayList<Long> ids = new ArrayList<>(); result.getRecords().forEach(r -> r.setUserName(remoteUserService.selectUserNameById(r.getUserId())));
result.getRecords().forEach(r -> ids.add(r.getUserId())); result.getRecords().forEach(r -> r.setAcceptanceUserName(remoteUserService.selectUserNameById(r.getAcceptanceUserId())));
result.getRecords().forEach(r -> ids.add(r.getAcceptanceUserId()));
Map<Long, String> userNamesByIds = remoteUserService.selectUserNamesByIds(ids);
result.getRecords().forEach(r ->r.setUserName(userNamesByIds.get(r.getUserId())));
result.getRecords().forEach(r ->r.setAcceptanceUserName(userNamesByIds.get(r.getUserId())));
// result.getRecords().forEach(r -> r.setUserName(remoteUserService.selectUserNameById(r.getUserId())));
// result.getRecords().forEach(r -> r.setAcceptanceUserName(remoteUserService.selectUserNameById(r.getAcceptanceUserId())));
result.getRecords().forEach(r -> { result.getRecords().forEach(r -> {
AssetVo assetVo = assetMapper.selectVoById(r.getAssetId()); AssetVo assetVo = assetMapper.selectVoById(r.getAssetId());
r.setAssetName(assetVo==null?"资产不存在" : assetVo.getName()); r.setAssetName(assetVo==null?"资产不存在" : assetVo.getName());