From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-utils/src/main/java/com/java110/utils/cache/BusinessTableHisCache.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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..2d298e3 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
@@ -1,8 +1,7 @@
package com.java110.utils.cache;
-import com.java110.dto.businessTableHis.BusinessTableHisDto;
+import com.java110.dto.system.BusinessTableHisDto;
import com.java110.utils.util.SerializeUtil;
-import redis.clients.jedis.Jedis;
import java.util.ArrayList;
import java.util.List;
@@ -59,6 +58,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