From daac8054cb53b312418413902d3ff86ddd4a8d22 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Sat, 19 May 2018 12:23:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8A=9F=E8=83=BD=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E3=80=81=E9=85=8D=E7=BD=AE=E5=9F=9F=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/DictUtils.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/util/DictUtils.java b/src/main/java/com/nis/util/DictUtils.java
index d72eced95..6cf4fb229 100644
--- a/src/main/java/com/nis/util/DictUtils.java
+++ b/src/main/java/com/nis/util/DictUtils.java
@@ -187,10 +187,10 @@ public class DictUtils {
 		if(StringUtil.isEmpty(allDictList)){
 			FunctionServiceDict entity = new FunctionServiceDict();
 			allDictList = functionServiceDictDao.getList(entity);
-			CacheUtils.put(Constants.CACHE_FUNCTION_SERVICE_DICT, dictList);
+			CacheUtils.put(Constants.CACHE_FUNCTION_SERVICE_DICT, allDictList);
 		}
 		for(FunctionServiceDict entity:allDictList){
-			if(entity.getFunctionId()==functionId){
+			if(entity.getFunctionId().equals(functionId)){
 				dictList.add(entity);
 			}
 		}
@@ -207,10 +207,10 @@ public class DictUtils {
 		if(StringUtil.isEmpty(allDictList)){
 			FunctionRegionDict entity = new FunctionRegionDict();
 			allDictList = functionRegionDictDao.getList(entity);
-			CacheUtils.put(Constants.CACHE_FUNCTION_REGION_DICT, dictList);
+			CacheUtils.put(Constants.CACHE_FUNCTION_REGION_DICT, allDictList);
 		}
 		for(FunctionRegionDict entity:allDictList){
-			if(entity.getFunctionId()==functionId){
+			if(entity.getFunctionId().equals(functionId)){
 				dictList.add(entity);
 			}
 		}