echo
/
route
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【fix】更改行程单查询接口为null为空时的判断逻辑

This commit is contained in:
nixj 2024-05-27 09:56:15 +08:00
parent 428990b6e8
commit 21470758cf
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java
View File

@ -54,6 +54,9 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
} }
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
if (dto.getActualOrderNo()!=null&&dto.getActualOrderNo().isEmpty()){
dto.setActualOrderNo(null);
}
params.put("actualOrderNo", dto.getActualOrderNo()); params.put("actualOrderNo", dto.getActualOrderNo());
params.put("userIds", dto.getUserIds()); params.put("userIds", dto.getUserIds());
PageRequest pageRequest = PageRequest PageRequest pageRequest = PageRequest

9
src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java
View File

@ -89,9 +89,12 @@ public class ManageServiceImpl implements ManageService {
@Override @Override
public PageResult<ItineraryPageDto> itineraryPageQuery(ItineraryPageQuery dto) { public PageResult<ItineraryPageDto> itineraryPageQuery(ItineraryPageQuery dto) {
List<User> users=jdbcUserRepository.findAllByNameContains(dto.getApplicant()); List<User> users=new ArrayList<>();
if (users==null||users.isEmpty()){ if (dto.getApplicant()!=null&&!dto.getApplicant().isEmpty()){
return null; users=jdbcUserRepository.findAllByNameContains(dto.getApplicant());
if (users==null||users.isEmpty()){
return null;
}
} }
dto.setUserIds(users.stream().map(User::getEmployeeNo).toList()); dto.setUserIds(users.stream().map(User::getEmployeeNo).toList());
Page<ItineraryPageDto> page= jdbcConsumptionDetailRepository.itineraryPageQueryByDto(dto); Page<ItineraryPageDto> page= jdbcConsumptionDetailRepository.itineraryPageQueryByDto(dto);