wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1138' into dev

Browse Source
This commit is contained in:
金海洋 2023-10-13 17:08:37 +08:00
commit aaf0e4c8e8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
View File

@ -491,8 +491,8 @@ public class MessageRecordServiceImpl implements MessageRecordService {
); );
calcCount(constructionList, res); calcCount(constructionList, res);
List<MsgStatisticsDTO> tradeList = messageRecordDao.statisticsMsg4Trade(personId); // List<MsgStatisticsDTO> tradeList = messageRecordDao.statisticsMsg4Trade(personId);
calcCount(tradeList, res); // calcCount(tradeList, res);
return res; return res;
} }

6
msg-center-dal/src/main/resources/mapper/MessageRecordMapper.xml
View File

@ -55,9 +55,9 @@
and record.is_delete = 0 and record.is_delete = 0
and ( and (
(record.to_id = #{identityId} and record.receive_type = #{receiveType}) (record.to_id = #{identityId} and record.receive_type = #{receiveType})
<if test="personId != null"> <!-- <if test="personId != null">-->
or (record.to_id = 0 and record.receive_type = 9 and record.person_id = #{personId} ) <!-- or (record.to_id = 0 and record.receive_type = 9 and record.person_id = #{personId} )-->
</if> <!-- </if>-->
) )
<if test="states != null and states.size > 0"> <if test="states != null and states.size > 0">
and record.state in and record.state in