Merge remote-tracking branch 'origin/master'

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml

@@ -215,6 +215,7 @@
         <if test="q.cardNo != null and q.cardNo != ''">
             AND wo.CARD_NO = #{q.cardNo}
         </if>
+
         <if test="q.woCode != null">
             AND wo.WO_ID = #{q.woCode}
         </if>
@@ -232,9 +233,7 @@
             AND yo.PRODUCT_IDENT = #{q.prodIdent}
         </if>
 
-        <if test="q.cardNo != null and q.cardNo != ''">
+
-            AND wo.CARD_NO = #{q.cardNo}
-        </if>
         -- ps
         <if test="q.currentProcessId != null">
             AND ps.ID = #{q.currentProcessId}