Merge branch 'dev'

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@@ -253,11 +253,13 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
         }
         Map<Boolean, List<CrmParameterResultDTO>> groupBySwitch = parameterResult.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getSwitchStatus));
         List<CrmParameterResultDTO> crmParameterTrue = groupBySwitch.get(true);
-        Map<Boolean, List<CrmParameterResultDTO>> groupByStatus = crmParameterTrue.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getBalanceStatus));
-        List<CrmParameterResultDTO> crmParameterResultDTOS = groupByStatus.get(true);
-        // 把参数开关打开的，已发送短信的客户更新余额
-        if (!CollectionUtils.isEmpty(crmParameterResultDTOS)){
-            operCrmOpenFeignClient.updateParamInfo(crmParameterResultDTOS);
+        if (!CollectionUtils.isEmpty(crmParameterTrue)){
+            Map<Boolean, List<CrmParameterResultDTO>> groupByStatus = crmParameterTrue.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getBalanceStatus));
+            List<CrmParameterResultDTO> crmParameterResultDTOS = groupByStatus.get(true);
+            // 把参数开关打开的，已发送短信的客户更新余额
+            if (!CollectionUtils.isEmpty(crmParameterResultDTOS)){
+                operCrmOpenFeignClient.updateParamInfo(crmParameterResultDTOS);
+            }
         }
     }
 

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -240,7 +240,7 @@
             </activation>-->
             <properties>
                 <server.port>8112</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
+                <spring.profiles.active>prod</spring.profiles.active>
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>