|
@@ -1,6 +1,7 @@
|
|
|
package com.hys.app.service.erp.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.aliyuncs.IAcsClient;
|
|
@@ -122,7 +123,11 @@ public class SmsMailManagerImpl extends ServiceImpl<SmsMailMapper, SmsMailTempla
|
|
|
.eq(SmsMailTemplate::getType,type)
|
|
|
.eq(SmsMailTemplate::getEnableStatus,type));
|
|
|
Set<Long> set = list.stream().map(SmsMailTemplate::getPid).collect(Collectors.toSet());
|
|
|
- return list(new LambdaQueryWrapper<SmsMailTemplate>().notIn(SmsMailTemplate::getId,set));
|
|
|
+ LambdaQueryWrapper<SmsMailTemplate> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ if (CollUtil.isNotEmpty(set)){
|
|
|
+ wrapper.notIn(SmsMailTemplate::getId,set);
|
|
|
+ }
|
|
|
+ return list(wrapper);
|
|
|
}
|
|
|
|
|
|
private void checkParam(SmsMailTemplate smsMailTemplate) {
|