查询条件修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -119,7 +119,7 @@ public class WarningNoticeLogController extends AbstractController {
     @ApiOperation("根据keyId获取过期提醒次数")
     public ResultData getRemindData(@RequestParam(name = "keyId 各类型id",value = "keyId") Long keyId,
                                     @RequestParam(name = "预警类型(1算法识别 2化学品 3气瓶 4预案)",value = "type") Integer type) {
-        List<WarningNoticeLog> list = warningNoticeLogService.list(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getKeyId, keyId).eq(WarningNoticeLog::getWarningType,type));
+        List<WarningNoticeLog> list = warningNoticeLogService.list(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getKeyId, keyId).eq(WarningNoticeLog::getWarningType,type).eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
         List<WarningNoticeLogDto> warningNoticeLogDtos = com.zd.common.core.utils.BeanUtils.copyList2List(list, WarningNoticeLogDto.class);
         return ResultData.success(warningNoticeLogDtos);
     }