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

src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml

@@ -273,7 +273,8 @@
         LEFT JOIN hrsa_other_archives e ON a.id = e.employee_id
         LEFT JOIN bill_hrmdismiss f on a.id = f.resource_n
         WHERE
-        1 = 1
+            c.delete_type = 0 AND d.delete_type = 0
+            AND e.delete_type = 0
         <include refid="paramSql"/>
         <include refid="paramSqlCommon"/>
         ORDER BY a.id asc