Commit fe16fda8 authored by huyuchen's avatar huyuchen

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

parents 1e5ce3fa 66940bae
...@@ -110,8 +110,6 @@ public class TSocialAlertInfoServiceImpl extends ServiceImpl<TSocialAlertInfoMap ...@@ -110,8 +110,6 @@ public class TSocialAlertInfoServiceImpl extends ServiceImpl<TSocialAlertInfoMap
R<SysUsersVo> res = upmsDaprUtils.getInUseUserByIds(userIds); R<SysUsersVo> res = upmsDaprUtils.getInUseUserByIds(userIds);
if (Common.isNotNull(res) && Common.isNotNull(res.getData()) && Common.isNotNull(res.getData().getUserList())) { if (Common.isNotNull(res) && Common.isNotNull(res.getData()) && Common.isNotNull(res.getData().getUserList())) {
userList = res.getData().getUserList(); userList = res.getData().getUserList();
}else {
log.error("社保办理失败通知-获取用户信息失败");
} }
} }
//找出不在userList中的数据或userList有数据但是lockFlag 不等于0 或 userList有数据但是wxMessage为空 //找出不在userList中的数据或userList有数据但是lockFlag 不等于0 或 userList有数据但是wxMessage为空
...@@ -191,8 +189,8 @@ public class TSocialAlertInfoServiceImpl extends ServiceImpl<TSocialAlertInfoMap ...@@ -191,8 +189,8 @@ public class TSocialAlertInfoServiceImpl extends ServiceImpl<TSocialAlertInfoMap
StringBuilder sendUserIds = new StringBuilder(); StringBuilder sendUserIds = new StringBuilder();
if (houseHoldMap != null && houseHoldMap.size() > 0){ if (houseHoldMap != null && houseHoldMap.size() > 0){
if (houseHoldUserMap != null && houseHoldUserMap.size() > 0){ if (houseHoldUserMap != null && houseHoldUserMap.size() > 0){
for (String key : houseHoldUserMap.keySet()) { for (String key : houseHoldMap.keySet()) {
if (null != houseHoldMap.get(key)){ if (null != houseHoldUserMap.get(key)){
if (sendUserIds.length() == 0) { if (sendUserIds.length() == 0) {
sendUserIds.append(houseHoldUserMap.get(key)); sendUserIds.append(houseHoldUserMap.get(key));
} else { } else {
......
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