Commit 01bc6528 authored by hongguangwu's avatar hongguangwu

MVP1.7.0 优化

parent 9eb0d911
...@@ -651,7 +651,7 @@ public class DiyExcelImportUtil implements Serializable { ...@@ -651,7 +651,7 @@ public class DiyExcelImportUtil implements Serializable {
if (Common.isEmpty(tempStr)) { if (Common.isEmpty(tempStr)) {
tempStr = String.valueOf(RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE + c)); tempStr = String.valueOf(RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE + c));
if (Common.isEmpty(tempStr)) { if (Common.isEmpty(tempStr)) {
errorFormat.append(attr.name()).append(";"); errorFormat.append(attr.name()).append("不正确或上级异常;");
} else { } else {
parentAreaMap.put(shuName, c); parentAreaMap.put(shuName, c);
dictMap.put(c + "_0", tempStr); dictMap.put(c + "_0", tempStr);
...@@ -664,7 +664,7 @@ public class DiyExcelImportUtil implements Serializable { ...@@ -664,7 +664,7 @@ public class DiyExcelImportUtil implements Serializable {
if (Common.isEmpty(tempStr)) { if (Common.isEmpty(tempStr)) {
tempStr = String.valueOf(RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE + c + "_" + parentAreaMap.get(attr.parentField()))); tempStr = String.valueOf(RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE + c + "_" + parentAreaMap.get(attr.parentField())));
if (Common.isEmpty(tempStr)) { if (Common.isEmpty(tempStr)) {
errorFormat.append(attr.name()).append(";"); errorFormat.append(attr.name()).append("不正确或上级异常;");
} else { } else {
parentAreaMap.put(shuName, c); parentAreaMap.put(shuName, c);
dictMap.put(c.trim() + "_" + parentAreaMap.get(attr.parentField()), tempStr); dictMap.put(c.trim() + "_" + parentAreaMap.get(attr.parentField()), tempStr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment