Commit 62a26683 authored by fangxinjiang's avatar fangxinjiang

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

parents cf43fece fb48a769
...@@ -238,6 +238,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -238,6 +238,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
vo = ygsAddlist.get(index); vo = ygsAddlist.get(index);
// 派减离职原因转化: // 派减离职原因转化:
if (type == 2 && Common.isNotNull(vo.getTbyy())) { if (type == 2 && Common.isNotNull(vo.getTbyy())) {
reduceSet = reduceChiZhouMap.get(vo.getTbyy());
if (reduceSet != null) {
vo.setChiZhouTbyy(reduceSet.getTbyy());
vo.setChiZhouZzyy(reduceSet.getZzyy());
}
reduceSet = reduceMap.get(vo.getTbyy()); reduceSet = reduceMap.get(vo.getTbyy());
if (reduceSet != null) { if (reduceSet != null) {
vo.setTbyy(reduceSet.getTbyy()); vo.setTbyy(reduceSet.getTbyy());
...@@ -255,11 +260,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -255,11 +260,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
} }
continue; continue;
} }
reduceSet = reduceChiZhouMap.get(vo.getTbyy());
if (reduceSet != null) {
vo.setChiZhouTbyy(reduceSet.getTbyy());
vo.setChiZhouZzyy(reduceSet.getZzyy());
}
} }
// 0:未到时间不动; 1:推送; 2:转人工;3预减员 // 0:未到时间不动; 1:推送; 2:转人工;3预减员
canPushType = this.getCanPushType(socialSetMap, vo); canPushType = this.getCanPushType(socialSetMap, vo);
...@@ -550,6 +550,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -550,6 +550,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
} else {*/ } else {*/
// 派减离职原因转化: // 派减离职原因转化:
if (type == 4 && Common.isNotNull(vo.getTbyy())) { if (type == 4 && Common.isNotNull(vo.getTbyy())) {
reduceSet = reduceChiZhouMap.get(vo.getTbyy());
if (reduceSet != null) {
vo.setChiZhouTbyy(reduceSet.getTbyy());
vo.setChiZhouZzyy(reduceSet.getZzyy());
}
reduceSet = reduceMap.get(vo.getTbyy()); reduceSet = reduceMap.get(vo.getTbyy());
if (reduceSet != null) { if (reduceSet != null) {
vo.setTbyy(reduceSet.getTbyy()); vo.setTbyy(reduceSet.getTbyy());
...@@ -567,11 +572,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -567,11 +572,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
} }
continue; continue;
} }
reduceSet = reduceChiZhouMap.get(vo.getTbyy());
if (reduceSet != null) {
vo.setChiZhouTbyy(reduceSet.getTbyy());
vo.setChiZhouZzyy(reduceSet.getZzyy());
}
} }
canPushType = this.getCanPushTypeYsd(socialSetMap, vo); canPushType = this.getCanPushTypeYsd(socialSetMap, vo);
if (1 == canPushType) { if (1 == canPushType) {
......
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