rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 一些调整

This commit is contained in:
曹鹏飞 2025-02-09 17:35:27 +08:00
parent 51eefc8e9d
commit 2916192e4e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java
View File

@ -3,7 +3,7 @@ package com.nflg.mobilebroken.common.pojo.request;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.time.LocalDateTime; import java.time.LocalDate;
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Data @Data
@ -16,8 +16,8 @@ public class SearchDeviceRequest extends PageRequest {
private String modelNo; private String modelNo;
//开始时间 //开始时间
private LocalDateTime startTime; private LocalDate startTime;
//结束时间 //结束时间
private LocalDateTime endTime; private LocalDate endTime;
} }

1
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
View File

@ -369,6 +369,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.eq(AppUser::getEnable, true) .eq(AppUser::getEnable, true)
.eq(AppUser::getIsPrimary, true) .eq(AppUser::getIsPrimary, true)
.like(AppUser::getLoginName, request.getName()) .like(AppUser::getLoginName, request.getName())
.like(AppUser::getName, request.getName())
.list() .list()
.stream() .stream()
.flatMap(s -> Arrays.stream(s.getCompanyId().split(","))) .flatMap(s -> Arrays.stream(s.getCompanyId().split(",")))