Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit ec5efaa4 by huangjy
Options

fix: 修复bug

parent d343d99c
Inline Side-by-side
Showing with 2 additions and 2 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
...@@ -148,7 +148,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe ...@@ -148,7 +148,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
.like(StringUtils.isNotBlank(param.getDealUser()), PlatAlarmRecord::getDealUser, param.getDealUser()) .like(StringUtils.isNotBlank(param.getDealUser()), PlatAlarmRecord::getDealUser, param.getDealUser())
.ge(Objects.nonNull(param.getDealDateFrom()), PlatAlarmRecord::getDealDate, param.getDealDateFrom()) .ge(Objects.nonNull(param.getDealDateFrom()), PlatAlarmRecord::getDealDate, param.getDealDateFrom())
.le(Objects.nonNull(param.getDealDateTo()), PlatAlarmRecord::getDealDate, param.getDealDateTo()) .le(Objects.nonNull(param.getDealDateTo()), PlatAlarmRecord::getDealDate, param.getDealDateTo())
.eq(CollectionUtils.isNotEmpty(orgIdList), PlatAlarmRecord::getOrgId, orgIdList) .in(CollectionUtils.isNotEmpty(orgIdList), PlatAlarmRecord::getOrgId, orgIdList)
.apply(StringUtils.isNotBlank(param.getNotifyUser()), "find_in_set('" + param.getNotifyUser() + "',notify_user)") .apply(StringUtils.isNotBlank(param.getNotifyUser()), "find_in_set('" + param.getNotifyUser() + "',notify_user)")
.and(CollectionUtils.isNotEmpty(param.getElderIdList()), qw -> { .and(CollectionUtils.isNotEmpty(param.getElderIdList()), qw -> {
List<String> elderIdList = param.getElderIdList(); List<String> elderIdList = param.getElderIdList();
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
...@@ -120,7 +120,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -120,7 +120,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
.le(Objects.nonNull(dto.getCheckInEndTime()),PlatElder::getCheckInTime,dto.getCheckInEndTime()) .le(Objects.nonNull(dto.getCheckInEndTime()),PlatElder::getCheckInTime,dto.getCheckInEndTime())
.ge(Objects.nonNull(dto.getCheckOutStartTime()),PlatElder::getCheckOutTime,dto.getCheckOutStartTime()) .ge(Objects.nonNull(dto.getCheckOutStartTime()),PlatElder::getCheckOutTime,dto.getCheckOutStartTime())
.le(Objects.nonNull(dto.getCheckOutEndTime()),PlatElder::getCheckOutTime,dto.getCheckOutEndTime()) .le(Objects.nonNull(dto.getCheckOutEndTime()),PlatElder::getCheckOutTime,dto.getCheckOutEndTime())
.eq(CollectionUtils.isNotEmpty(orgIdList), PlatElder::getOrgId, orgIdList) .in(CollectionUtils.isNotEmpty(orgIdList), PlatElder::getOrgId, orgIdList)
.like(StringUtils.isNotBlank(dto.getCertificateNumber()), PlatElder::getCertificateNumber, dto.getCertificateNumber()) .like(StringUtils.isNotBlank(dto.getCertificateNumber()), PlatElder::getCertificateNumber, dto.getCertificateNumber())
.apply(StringUtils.isNotBlank(dto.getSpaceId()), "find_in_set('" + dto.getSpaceId() + "',space_path)") .apply(StringUtils.isNotBlank(dto.getSpaceId()), "find_in_set('" + dto.getSpaceId() + "',space_path)")
.apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)") .apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment