Merge branch 'information-27' into dev

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuSpec.java

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuSpec.java

@@ -13,38 +13,38 @@ import java.util.List;
 @Getter
 @Setter
 public class ReqGoodsSkuSpec {
-    private String key;
+	private String key;
 
-    private List<Node> values;
+	private List<Node> values;
 
-    @Getter
-    @Setter
-    public static class Node {
-        private Integer id;
+	@Getter
+	@Setter
+	public static class Node {
+		private Integer id;
 
-        private String value;
+		private String value;
 
-        private Boolean hide;
+		private Boolean hide;
 
-        private String logo;
+		private String logo;
 
-        private BigDecimal price;
+		private BigDecimal price;
 
-        /**
-         * 租赁押金
-         */
-        private BigDecimal deposit;
+		/**
+		 * 租赁押金
+		 */
+		private BigDecimal deposit;
 
-        /**
-         * 预览图
-         */
-        private String previewImgs;
+		/**
+		 * 预览图
+		 */
+		private String previewImgs;
 
-        private String benefitsList;
+		private String benefitsList;
 
-        /**
-         * 原价
-         */
-        private BigDecimal benefitsPrice;
-    }
+		/**
+		 * 原价
+		 */
+		private BigDecimal benefitsPrice;
+	}
 }

netflix-service/src/main/java/com/cyksj/service/user/impl/UserSysMsgNotifyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cyksj.service.user.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.mapper.UserSysMsgNotifyMapper;
@@ -40,7 +41,9 @@ public class UserSysMsgNotifyServiceImpl extends ServiceImpl<UserSysMsgNotifyMap
 			userSet.add(e.getUserId());
 			return true;
 		}).collect(Collectors.toList());
-		userSysMsgNotifyMapper.recordUserAccountUpdateSysMsg(goodsId, skuId, collect, account, sysMsg);
+		if (CollUtil.isNotEmpty(collect)) {
+			userSysMsgNotifyMapper.recordUserAccountUpdateSysMsg(goodsId, skuId, collect, account, sysMsg);
+		}
 	}
 
 	@Override
@@ -54,6 +57,8 @@ public class UserSysMsgNotifyServiceImpl extends ServiceImpl<UserSysMsgNotifyMap
 			userSet.add(e.getUserId());
 			return true;
 		}).collect(Collectors.toList());
-		userSysMsgNotifyMapper.recordUserAccountSetSysMsg(goodsId, skuId, collect, account, sysMsg);
+		if (CollUtil.isNotEmpty(collect)) {
+			userSysMsgNotifyMapper.recordUserAccountSetSysMsg(goodsId, skuId, collect, account, sysMsg);
+		}
 	}
 }