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) 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 getProductGroups(String productId){ - String key=this.getProductKey(productId); - return (List) redisTemplate.opsForHash().values(key); - + List groupVoList=this.cache.get("prd_"+productId); + if(groupVoList==null){ + String key=this.getProductKey(productId); + groupVoList= (List) 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;