diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index cf7aef270e..4e2453104a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -276,7 +276,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { formDTO.setPatrolStartTime(DateUtils.getBeforeMonthDate(formDTO.getTime(), "yyyyMMdd")); List staffList = new ArrayList<>(); //2-1.按名字检索时先查询人员基础信息 - if (StringUtils.isEmpty(formDTO.getStaffName())) { + if (!StringUtils.isEmpty(formDTO.getStaffName())) { staffList = customerStaffDao.selectByStaffIds(null, formDTO.getStaffName()); if (!CollectionUtils.isEmpty(staffList)) { formDTO.setStaffId(staffList.get(0).getUserId()); @@ -285,7 +285,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { //2-2.查询业务数据 resultList = staffPatrolRecordDao.selectStaffPatrolList(formDTO); //2-3.查询人员基本信息【之前sql关联人员表查性别、姓名效率低 所以分开查) - if (!CollectionUtils.isEmpty(staffList)) { + if (CollectionUtils.isEmpty(staffList)) { List staffIdList = resultList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList()); staffList = customerStaffDao.selectByStaffIds(staffIdList, null); }