From 14b1aaecb3cb1042663135038bc1e81208a7ef6f Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 26 七月 2023 09:42:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
index 313d921..92ed5dd 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
@@ -106,8 +106,16 @@
@Override
public int insertArdAlarmTypeConfig(Map<String,Object> configInfo) {
String userId =(String) configInfo.get("userId");
+ if(userId==null)
+ {
+ return 0;
+ }
ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByCurrentUserId(userId);
List<Integer> commands=(List<Integer>) configInfo.get("commands");
+ if(commands==null)
+ {
+ return 0;
+ }
if(commands.size()==0)
{
return 0;
--
Gitblit v1.9.3