Merge remote-tracking branch 'origin/event_fusion' into event_fusion

src/main/java/com/zzsn/event/mapper/xml/CommonMapper.xml

@@ -244,7 +244,8 @@
         </if>
         ) x) b
         on (a.subject_id = b.subject_id and a.source_id = b.source_id)
-        where b.source_id is null group by a.subject_id
+        LEFT JOIN info_source x on(a.source_id = x.id)
+        where b.source_id is null and x.id is not null group by a.subject_id
     </select>
 
     <select id="selectOldLabelTypeList" resultType="com.zzsn.event.feign.entity.SysDict">

src/main/java/com/zzsn/event/service/impl/InformationServiceImpl.java

@@ -131,7 +131,7 @@ public class InformationServiceImpl implements InformationService {
         if (StringUtils.isNotEmpty(reportId)) {
             ReportConditionVO reportCondition = commonService.getReportCondition(reportId);
             String dataBaseCondition = reportCondition.getDataBaseCondition();
-            if (StringUtils.isNotEmpty(dataBaseCondition)) {
+            if (StringUtils.isEmpty(dataBaseCondition)) {
                 dataBaseCondition = "{}";
             }
             JSONObject reportBaseCondition = JSONObject.parseObject(dataBaseCondition);