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

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

@@ -35,6 +35,7 @@
                 arrange_id IN
                 (SELECT DISTINCT arrange_id FROM clb_model_arrange_subject_map
                  WHERE subject_id = #{subjectId} AND del_flag = 0 )
+              AND del_flag = 0
               AND base_node_id = '1872120615905812482')
           and (label_id is not null or dict_code is not null)
     </select>