Commit 58080246 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8

parents b1593ae1 295eb62a
...@@ -148,12 +148,13 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -148,12 +148,13 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
SysConfig sysConfig) { SysConfig sysConfig) {
if (Common.isNotNull(userMap) && Common.isNotKong(domainHashMap)){ if (Common.isNotNull(userMap) && Common.isNotKong(domainHashMap)){
TSettleDomain domain; TSettleDomain domain;
SysUser user = null; SysUser user;
String loginName; String loginName;
String nickName = null; String nickName;
String userId = null; String userId;
for (TInsuranceAlert alert: list){ for (TInsuranceAlert alert: list){
userId = null; userId = null;
nickName = null;
if (Common.isNotNull(userMap.get(alert.getCreateBy()))){ if (Common.isNotNull(userMap.get(alert.getCreateBy()))){
domain = domainHashMap.get(alert.getDeptNo()); domain = domainHashMap.get(alert.getDeptNo());
if (Common.isNotNull(domain)){ if (Common.isNotNull(domain)){
......
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