From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 15 十二月 2022 11:29:08 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java index dcbde34..6e71271 100644 --- a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.controller.video.common.util.CommonUtils; import com.ycl.entity.message.SmsTemplate; import com.ycl.mapper.message.SmsTemplateMapper; import com.ycl.service.message.ISmsTemplateService; @@ -23,11 +24,11 @@ public IPage<SmsTemplate> list(SmsTemplate smsTemplate) { Page<SmsTemplate> page = new Page<>(smsTemplate.getCurrent(), smsTemplate.getPageSize()); LambdaQueryWrapper<SmsTemplate> queryWrapper = new LambdaQueryWrapper<>(); - if (smsTemplate.getType() != null) { + if (CommonUtils.isNotEmpty(smsTemplate.getType()) && smsTemplate.getType()!=0) { queryWrapper.eq(SmsTemplate::getType, smsTemplate.getType()); } - if (smsTemplate.getTitle() != null) { - queryWrapper.eq(SmsTemplate::getTitle, smsTemplate.getTitle()); + if (smsTemplate.getTitle()!=null&&!smsTemplate.getTitle().isEmpty()) { + queryWrapper.like(SmsTemplate::getTitle, smsTemplate.getTitle()); } Page<SmsTemplate> result = baseMapper.selectPage(page, queryWrapper); return result; -- Gitblit v1.8.0