Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -1519,7 +1519,7 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
                 AND (
                 dbo.plm_get_customer_desc(c.site, c.customer_id) like #{customerDesc})
             </if>
-            <if test="status == null or status == ''">
+            <if test="statusDesc == null or statusDesc == ''">
                 and a.status != 'death'
             </if>
             <if test="statusDesc != null and statusDesc != ''">
@@ -1586,8 +1586,11 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
                 dbo.plm_get_dictDataLabel('finalCustomer', c.final_customer_id, c.site) like #{customerDesc}
                 )
             </if>
+            <if test="statusDesc == null or statusDesc == ''">
+                and a.status != 'death'
+            </if>
             <if test="statusDesc != null and statusDesc != ''">
-                AND dbo.plm_get_technicalBaseDesc(a.status, 'status') like #{statusDesc}
+                AND a.status like #{statusDesc}
             </if>
             <if test="buNo == null || buNo == ''">
                 AND b.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(#{site}, #{userName}))