|
@@ -140,9 +140,9 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
|
|
protected int smsConditionCount(Long userId, String mobileNumber, String condition) {
|
|
protected int smsConditionCount(Long userId, String mobileNumber, String condition) {
|
|
QueryWrapper<BasicMessage> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BasicMessage> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.lambda().eq(BasicMessage::getUserId, userId)
|
|
queryWrapper.lambda().eq(BasicMessage::getUserId, userId)
|
|
- .eq(BasicMessage::getMobileNumber, mobileNumber)
|
|
|
|
|
|
+ .eq(StringUtils.isNotBlank(mobileNumber), BasicMessage::getMobileNumber, mobileNumber)
|
|
.eq(BasicMessage::getMessageType, MessageEnum.NOTICE_OF_MARK_TASK_CREATED)
|
|
.eq(BasicMessage::getMessageType, MessageEnum.NOTICE_OF_MARK_TASK_CREATED)
|
|
- .eq(BasicMessage::getSendStatus, "OK")
|
|
|
|
|
|
+// .eq(BasicMessage::getSendStatus, "OK")
|
|
.and(w -> w.isNotNull(BasicMessage::getRemark).and(x -> x.eq(BasicMessage::getRemark, condition)));
|
|
.and(w -> w.isNotNull(BasicMessage::getRemark).and(x -> x.eq(BasicMessage::getRemark, condition)));
|
|
return this.count(queryWrapper);
|
|
return this.count(queryWrapper);
|
|
}
|
|
}
|