From 1df4745ef0d880bbbf08dd5adabfcbb2dbcc0019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 28 Jan 2023 01:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/cache/XmGroupCacheService.java    | 19 +++++++++++++++----
 .../service/cache/XmProductCacheService.java  |  4 +++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/service/cache/XmGroupCacheService.java b/xm-core/src/main/java/com/xm/core/service/cache/XmGroupCacheService.java
index bb465d1a..9f99b32d 100644
--- a/xm-core/src/main/java/com/xm/core/service/cache/XmGroupCacheService.java
+++ b/xm-core/src/main/java/com/xm/core/service/cache/XmGroupCacheService.java
@@ -59,7 +59,10 @@ public class XmGroupCacheService {
 		if(groupVoList==null){
 			String key=this.getProjectKey(projectId);
 			groupVoList=  (List<XmGroupVo>) redisTemplate.opsForHash().values(key);
-			this.cache.put("prj_"+projectId,groupVoList);
+
+			if(groupVoList!=null){
+				this.cache.put("prj_"+projectId,groupVoList);
+			}
 			return groupVoList;
 		}else {
 			return groupVoList;
@@ -113,9 +116,17 @@ public class XmGroupCacheService {
 	}
 
 	public  List<XmGroupVo>  getProductGroups(String productId){
-		String key=this.getProductKey(productId);
-		return (List<XmGroupVo>) redisTemplate.opsForHash().values(key);
-
+		List<XmGroupVo> groupVoList=this.cache.get("prd_"+productId);
+		if(groupVoList==null){
+			String key=this.getProductKey(productId);
+			groupVoList= (List<XmGroupVo>) redisTemplate.opsForHash().values(key);
+			if(groupVoList!=null){
+				this.cache.put("prd_"+productId,groupVoList);
+			}
+			return groupVoList;
+		}else {
+			return groupVoList;
+		}
 	}
 	public XmGroupVo getProductGroup(String productId, String groupId){
 		String key=this.getProductKey(productId);
diff --git a/xm-core/src/main/java/com/xm/core/service/cache/XmProductCacheService.java b/xm-core/src/main/java/com/xm/core/service/cache/XmProductCacheService.java
index 58b0b4e2..94761126 100644
--- a/xm-core/src/main/java/com/xm/core/service/cache/XmProductCacheService.java
+++ b/xm-core/src/main/java/com/xm/core/service/cache/XmProductCacheService.java
@@ -55,7 +55,9 @@ public class XmProductCacheService {
 			String key=this.getKey();
 			String hashKey=productId;
 			product= (XmProduct) redisTemplate.opsForHash().get(key, hashKey);
-			cache.put(productId,product);
+			if(product!=null){
+				cache.put(productId,product);
+			}
 			return product;
 		}else {
 			return product;