|
@@ -163,8 +163,16 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object pageList(Long pageNum, Long pageSize, String snCode, String deptId, Integer type) {
|
|
|
+ public Object pageList(Long pageNum, Long pageSize, String snCode, String deptId, Integer type,String searchKey) {
|
|
|
LambdaQueryWrapper<TmCamera> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ if(StringUtils.isNotBlank(searchKey)){
|
|
|
+ List<TmUser> tmUsers = tmUserService.getLikeNickName(searchKey);
|
|
|
+ if(tmUsers.size() <=0){
|
|
|
+ return PageInfo.PageInfo(new Page<>(pageNum,pageSize));
|
|
|
+ }
|
|
|
+ List<String> userIds = tmUsers.stream().map(TmUser::getId).collect(Collectors.toList());
|
|
|
+ wrapper.in(TmCamera::getUserId,userIds);
|
|
|
+ }
|
|
|
if (StringUtils.isNotBlank(snCode)) {
|
|
|
wrapper.like(TmCamera::getCameraSn,snCode);
|
|
|
}
|