修改代码框bug

src/main/java/com/cc/controller/RedisRsetController.java

@@ -94,28 +94,32 @@ public class RedisRsetController {
 		    Set<String> dictitemKeys= (Set<String>) result.getData();
 		    String AllKey="";
            //删除对应的数据源
-			for (String key : dictitemKeys) {
+		    if(null!=dictitemKeys){
+				for (String key : dictitemKeys) {
 					AllKey+=key+"__";
 					redisService.DelRedisRest(key);
+				}
+				System.out.print("匹配出的AllKey========================="+AllKey);
 			}
-		    System.out.print("匹配出的AllKey========================="+AllKey);
 			//存储所有字典------------------------------------------------------
 		   //shiro 单位字典特殊处理
-			if (type.equals("SHIRO_UNIT")){
-				dictitem.setGroupid("CODE_UNIT");
-				dictitem.setCode(ssdw+"%");
-				JSONArray unit = dictitemService.selectDictitemByCondition(dictitem);
-				result = redisService.SaveRedisRest("15_SHIRO_UNIT",unit.toString());
-			}else{
-				//传统项目字典特殊处理
+		if (null!=type && type.equals("SHIRO_UNIT")) {
+			dictitem.setGroupid("CODE_UNIT");
+			dictitem.setCode(ssdw + "%");
+			JSONArray unit = dictitemService.selectDictitemByCondition(dictitem);
+			result = redisService.SaveRedisRest("15_SHIRO_UNIT", unit.toString());
+		} else {
+			//传统项目字典特殊处理
+			if(null!=type && "null"!=type) {
 				dictitem.setGroupid(type);
-				List<SysDictitem> SysDictitemList = dictitemService.findCodeAllByType(dictitem);
-				for(SysDictitem node:SysDictitemList){
-					String nodeStr= JSON.toJSONString(node);
-					String key = ssdw+"_"+node.getGroupid()+"_"+node.getCode()+"_"+node.getName()+"_"+node.getPid();
-					result = redisService.SaveRedisRest(key,nodeStr);
-				}
 			}
+			List<SysDictitem> SysDictitemList = dictitemService.findCodeAllByType(dictitem);
+			for (SysDictitem node : SysDictitemList) {
+				String nodeStr = JSON.toJSONString(node);
+				String key = ssdw + ":" + node.getGroupid() + ":" + node.getPid() + ":" + node.getCode() + ":" + node.getName() + ":" + node.getCode() + " | " + node.getName();
+				result = redisService.SaveRedisRest(key, nodeStr);
+			}
+		}
 		return result;
 	}
 }