huanglizhi преди 11 месеца
родител
ревизия
f56b84b8eb

+ 6 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/SmsMailManagerImpl.java

@@ -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) {

+ 1 - 1
server/src/main/resources/application-prod.yml

@@ -8,7 +8,7 @@ spring:
       ds0:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/erp-warehouse?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true&useSSL=false
+        url: jdbc:mysql://127.0.0.1:3306/erp-standard?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true&useSSL=false
         username: root
         password: 406054755e8f8bc5
 

+ 1 - 1
server/src/main/resources/application-test.yml

@@ -8,7 +8,7 @@ spring:
       ds0:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/erp-standard?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true&useSSL=false
+        url: jdbc:mysql://127.0.0.1:3306/erp-warehouse?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true&useSSL=false
         username: root
         password: e0056c1f91a395a2