From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-utils/src/main/java/com/java110/utils/cache/BusinessTableHisCache.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/cache/BusinessTableHisCache.java b/java110-utils/src/main/java/com/java110/utils/cache/BusinessTableHisCache.java
index 7181397..57360eb 100644
--- a/java110-utils/src/main/java/com/java110/utils/cache/BusinessTableHisCache.java
+++ b/java110-utils/src/main/java/com/java110/utils/cache/BusinessTableHisCache.java
@@ -2,7 +2,7 @@
import com.java110.dto.businessTableHis.BusinessTableHisDto;
import com.java110.utils.util.SerializeUtil;
-import redis.clients.jedis.Jedis;
+import com.java110.utils.cache.Jedis;
import java.util.ArrayList;
import java.util.List;
@@ -59,6 +59,9 @@
*/
public static BusinessTableHisDto getBusinessTableHisDto(String action, String actionObj) {
List<BusinessTableHisDto> businessTableHisDtoDtoDtos = getBusinessTableHiss();
+ if(businessTableHisDtoDtoDtos == null){
+ return null;
+ }
for (BusinessTableHisDto businessTableHisDtoDto : businessTableHisDtoDtoDtos) {
if (action.equals(businessTableHisDtoDto.getAction()) && actionObj.equals(businessTableHisDtoDto.getActionObj())) {
--
Gitblit v1.8.0