Merge remote-tracking branch 'origin/feature/screenDataPush'

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml

@@ -258,7 +258,7 @@
                     sd.pids,
                     IFNULL(
                         (
-                            topic.topicResolvedCount + topic.topicUnResolvedCount + issue.issueResolvedCount + issue.issueUnResolvedCount + item.issueProjectResolvedCount + item.issueProjectResolvedCount + item.issueProjectUnResolvedCount
+                            IFNULL(topic.topicResolvedCount, 0) + IFNULL(topic.topicUnResolvedCount, 0) + IFNULL(issue.issueResolvedCount, 0) + IFNULL(issue.issueUnResolvedCount, 0) + IFNULL(item.issueProjectResolvedCount, 0) + IFNULL(item.issueProjectUnResolvedCount, 0)
                         ),
                         0
                     ) AS problemResolvedCount,
@@ -625,7 +625,7 @@
                     sd.pids,
                     IFNULL(
                         (
-                            topic.topicResolvedCount + topic.topicUnResolvedCount + issue.issueResolvedCount + issue.issueUnResolvedCount + item.issueProjectResolvedCount + item.issueProjectResolvedCount + item.issueProjectUnResolvedCount
+                            IFNULL(topic.topicResolvedCount, 0) + IFNULL(topic.topicUnResolvedCount, 0) + IFNULL(issue.issueResolvedCount, 0) + IFNULL(issue.issueUnResolvedCount, 0) + IFNULL(item.issueProjectResolvedCount, 0) + IFNULL(item.issueProjectUnResolvedCount, 0)
                         ),
                         0
                     ) AS problemResolvedCount,