|
@@ -3408,8 +3408,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
//发送驳回通知消息
|
|
//发送驳回通知消息
|
|
User reporter = userMapper.selectById(fillUserId);
|
|
User reporter = userMapper.selectById(fillUserId);
|
|
String corpwxUserid = reporter.getCorpwxUserid();
|
|
String corpwxUserid = reporter.getCorpwxUserid();
|
|
- //这些日报的原审核状态,状态为已通过则需要判断新字段,1则发消息,0则不发消息[日报状态都一致]
|
|
|
|
- if(1 == oneReport.getState() && 1 == timeType.getReportChargeMsg()){
|
|
|
|
|
|
+ //这些日报的原审核状态,待审核的驳回或者 状态为已通过则需要判断新字段,1则发消息,0则不发消息[日报状态都一致]
|
|
|
|
+ if(oneReport.getState() != 1 || 1 == timeType.getReportChargeMsg()){
|
|
//先判断钉钉
|
|
//先判断钉钉
|
|
if (reporter.getDingdingUserid() != null) {
|
|
if (reporter.getDingdingUserid() != null) {
|
|
projectMapper.selectById(oneReport.getProjectId()).getProjectName();
|
|
projectMapper.selectById(oneReport.getProjectId()).getProjectName();
|