diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java index 6a89e6a6..17b0eb23 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java @@ -3,7 +3,7 @@ package com.nflg.mobilebroken.common.pojo.request; import lombok.Data; import lombok.EqualsAndHashCode; -import java.time.LocalDateTime; +import java.time.LocalDate; @EqualsAndHashCode(callSuper = false) @Data @@ -16,8 +16,8 @@ public class SearchDeviceRequest extends PageRequest { private String modelNo; //开始时间 - private LocalDateTime startTime; + private LocalDate startTime; //结束时间 - private LocalDateTime endTime; + private LocalDate endTime; } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java index 0b546f19..4e54f50a 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java @@ -369,6 +369,7 @@ public class AppUserServiceImpl extends ServiceImpl impl .eq(AppUser::getEnable, true) .eq(AppUser::getIsPrimary, true) .like(AppUser::getLoginName, request.getName()) + .like(AppUser::getName, request.getName()) .list() .stream() .flatMap(s -> Arrays.stream(s.getCompanyId().split(",")))