Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/change/ChangeManagementMapper.xml

@@ -21,11 +21,11 @@
         a.ECN_address,
         b.test_part_no
         FROM plm_technical_specification_sheet a
-        left join view_Project_final_Part b on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no
         LEFT JOIN plm_project_info c ON a.site = c.site AND a.project_id = c.project_id
         LEFT JOIN plm_customer_information j ON j.site = c.site and j.customer_no = c.customer_id
+        left join view_Project_final_Part b on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no
         <where>
-            a.site = #{query.site} AND (a.ECN_flag is null or a.ECN_flag = 'N') and a.status = '已完成'
+            a.site = #{query.site} AND isnull(a.ECN_flag, 'N') = 'N' and a.status = '已完成'
             <if test = "query.buNo != null and query.buNo != ''">
                 AND b.bu_no = #{query.buNo}
             </if>

src/main/resources/mapper/part/RoutingManagementMapper.xml

@@ -590,11 +590,18 @@
         operation_name
         FROM plm_routing_component
         <where>
-            site = #{site} and part_no = #{partNo} and routing_revision = #{routingRevision} and routing_type = #{routingType} and alternative_no = #{alternativeNo}
-            <if test = "operationNo != null and operationNo != ''">
+            site = #{site} and routing_type = #{routingType} and
+            alternative_no = #{alternativeNo}
+            <if test="operationNo != null and operationNo != ''">
                 AND operation_no = #{operationNo}
             </if>
-            <if test = "operationName != null and operationName != ''">
+            <if test="routingRevision != null and routingRevision != ''">
+                AND routing_revision = #{routingRevision}
+            </if>
+            <if test="partNo != null and partNo != ''">
+                AND part_no = #{partNo}
+            </if>
+            <if test="operationName != null and operationName != ''">
                 AND operation_name like #{operationName}
             </if>
         </where>