Merge branch 'liyuchun_fixbug_7008' into 'master'

* Fix bug #7008.

See merge request easycorp/zentaopms!3071

module/common/view/footer.html.php

@@ -16,11 +16,12 @@ needPing = false;
 $(function()
 {
     var windowBlur = false;
-    if(window.Notification)
+    if(window.Notification && Notification.permission == 'granted')
     {
         window.onblur  = function(){windowBlur = true;}
         window.onfocus = function(){windowBlur = false;}
     }
+
     setInterval(function()
     {
         $.get(createLink('message', 'ajaxGetMessage', "windowBlur=" + (windowBlur ? '1' : '0')), function(data)

module/mr/model.php

@@ -1392,6 +1392,7 @@ class mrModel extends model
             ->where('t1.AType')->eq('mr')
             ->andWhere('t1.BType')->eq($objectType)
             ->andWhere('t1.BID')->eq($objectID)
+            ->andWhere('t2.id')->ne(0)
             ->fetchPairs();
     }