Merge remote-tracking branch 'origin/master'

mailbox-lan/src/main/java/com/biutag/lan/service/DataScreenService.java

@@ -269,14 +269,14 @@ public class DataScreenService  extends ServiceImpl<DataScreenMapper, Mail> {
         }
         //获取主单位签收时长
        Map<String,Integer> signMap =  baseMapper.getDuration(mailDetail.getId(), FlowNodeEnum.SECOND_SIGN.getKey());
-        if(signMap.size()>0) {
+        if(StringUtils.isNotNull(signMap)  &&  signMap.size()>0 )  {
             mailDetail.setSignDuration(signMap.get("consuming_time"));
             mailDetail.setSignDuration(signMap.get("limited_time"));
             mailDetail.setSignDurationStr(TimeUtils.secondsToTime(signMap.get("consuming_time")));
         }
        //获取三级机构联系群众时长
        Map<String,Integer> contactMap =  baseMapper.getDuration(mailDetail.getId(), FlowNodeEnum.CONTACT_WRITER.getKey());
-       if(contactMap.size()>0) {
+       if(StringUtils.isNotNull(contactMap) &&  contactMap.size()>0) {
            mailDetail.setContactMassesDuration(contactMap.get("consuming_time"));
            mailDetail.setContactLimitedDuration(contactMap.get("limited_time"));
            mailDetail.setContactMassesDurationStr(TimeUtils.secondsToTime(contactMap.get("consuming_time")));

mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml

@@ -220,6 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                             where 1=1
         <if test="mailId != null and mailId != ''">  and    mail_id=#{mailId}</if>
         <if test="flowKey != null and flowKey != ''">  and  flow_key =#{flowKey}</if>
+        order by create_time desc limit 1
     </select>