Skip to content

Y
yifu-mvp
Commit 5bb51b1b authored by hongguangwu's avatar hongguangwu
Browse files
Options

MVP1.7.0 优化

parent b3353825
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @ 5bb51b1b
......@@ -421,7 +421,9 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
idLabelMap = areaListR.getData().getIdLabelMap();
}
}
redisLabelMap.putAll(idLabelMap);
if (redisLabelMap != null && idLabelMap != null) {
redisLabelMap.putAll(idLabelMap);
}
excelWriter = EasyExcelFactory.write(out).registerWriteHandler(ExcelStyle.getNormalStype())
.registerConverter(new DictConverter(nameAndDicTypeMap, redisLabelMap))
.includeColumnFieldNames(titleContent).head(headList).build();
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @ 5bb51b1b
......@@ -2534,8 +2534,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
idLabelMap = areaListR.getData().getIdLabelMap();
}
}
redisLabelMap.putAll(idLabelMap);
if (redisLabelMap != null && idLabelMap != null) {
redisLabelMap.putAll(idLabelMap);
}
excelWriter = EasyExcelFactory.write(out).registerWriteHandler(ExcelStyle.getNormalStype())
.registerConverter(new DictConverter(nameAndDicTypeMap, redisLabelMap))
.includeColumnFieldNames(titleContent).head(headList).build();
......
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