Commit 60ce3fb3 authored by wangzb's avatar wangzb

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

parents 262f63b3 0e42592b
......@@ -38,6 +38,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
......@@ -146,7 +147,7 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
saves.add(ms);
}
if (Common.isNotNull(tempMap)){
this.removeByIds(tempMap.values());
this.removeByIds(tempMap.values().stream().map(MsgInfo::getId).collect(Collectors.toList()));
}
if (Common.isNotNull(saves)){
this.saveBatch(saves);
......@@ -200,7 +201,7 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
saves.add(ms);
}
if (Common.isNotNull(tempMap)){
this.removeByIds(tempMap.values());
this.removeByIds(tempMap.values().stream().map(MsgInfo::getId).collect(Collectors.toList()));
}
this.saveBatch(saves);
}
......
......@@ -127,7 +127,7 @@
e.fd_fact_node_id = 'N5'
AND b1.fd_id IS NOT NULL
) x
where x.date1 > date2
where x.date1 > date2 GROUP BY x.ORDER_NO
</select>
<select id="getMsgByTaskOne" resultMap="msgInfoMap">
......@@ -140,9 +140,6 @@
b1.fd_3bddc3d6c8a734
FROM
ekp_ea33075576149bb8a4f5 b1
LEFT JOIN lbpm_process p ON p.fd_model_id = b1.fd_id
LEFT JOIN lbpm_node e ON p.fd_id = e.fd_process_id
LEFT JOIN lbpm_audit_note a ON p.fd_id=a.fd_process_id and a.fd_fact_node_id='N5'
LEFT JOIN sys_org_element o ON o.fd_id = b1.fd_3bf1511f1d618e
WHERE
b1.fd_3bddc3d6c8a734 = '待支出'
......
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