From 2cb34c56308db1490aa56e6b03d7b23605c2f7aa Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 02 十一月 2022 09:34:44 +0800
Subject: [PATCH] 修改校验
---
ycl-platform/src/main/java/com/ycl/service/message/impl/SmsTemplateServiceImpl.java | 5 +++--
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index f3d12e7..46976df 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -107,7 +107,7 @@
data.put("menus", roleService.getMenuList(umsAdmin.getId()));
data.put("icon", umsAdmin.getIcon());
List<UmsRole> roleList = adminService.getRoleList(umsAdmin.getId());
- if (CollUtil.isNotEmpty(roleList)) {
+ if (CollUtil.isNotEmpty(roleList)) {
List<String> roles = roleList.stream().map(UmsRole::getName).collect(Collectors.toList());
data.put("roles", roles);
}
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..4681e3e 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.common.util.CommonUtils;
import com.ycl.entity.message.SmsTemplate;
import com.ycl.mapper.message.SmsTemplateMapper;
import com.ycl.service.message.ISmsTemplateService;
@@ -23,10 +24,10 @@
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())) {
queryWrapper.eq(SmsTemplate::getType, smsTemplate.getType());
}
- if (smsTemplate.getTitle() != null) {
+ if (CommonUtils.isNotEmpty(smsTemplate.getTitle())) {
queryWrapper.eq(SmsTemplate::getTitle, smsTemplate.getTitle());
}
Page<SmsTemplate> result = baseMapper.selectPage(page, queryWrapper);
--
Gitblit v1.8.0