diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
index 2bad2b79..2d87fea1 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
@@ -17,6 +17,12 @@
         WHERE
         sar_stand_project_library.project_number in ( SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId})
         AND CLOSE_STATE = '1'
+        <if test="null != product.productName and ''!= product.productName">
+            and  product_name like concat(concat('%',#{product.productName}),'%')
+        </if>
+        <if test="null != product.productId and ''!= product.productId">
+            and  project_number like concat(concat('%',#{product.productId}),'%')
+        </if>
         group by
         PRODUCT_NAME,
         sar_stand_project_library.project_group,
@@ -25,12 +31,6 @@
         sar_stand_project_library.project_number,
         sar_stand_project_library.id,
         ts_user.UNAME
-        <if test="null != product.productName and ''!= product.productName">
-            and  product_name like concat(concat('%',#{product.productName}),'%')
-        </if>
-        <if test="null != product.productId and ''!= product.productId">
-            and  project_number like concat(concat('%',#{product.productId}),'%')
-        </if>
         ORDER BY
         PRODUCT_NAME ASC
         limit ${(page-1)*pageSize},${pageSize}
@@ -46,6 +46,12 @@
         WHERE
         sar_stand_project_library.project_number in (SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId})
         AND CLOSE_STATE = '1'
+        <if test="null != product.productName and ''!= product.productName">
+            and  product_name like concat(concat('%',#{product.productName}),'%')
+        </if>
+        <if test="null != product.productId and ''!= product.productId">
+            and  project_number like concat(concat('%',#{product.productId}),'%')
+        </if>
         group by
         PRODUCT_NAME,
         sar_stand_project_library.project_group,
@@ -54,12 +60,6 @@
         sar_stand_project_library.project_number,
         sar_stand_project_library.id,
         ts_user.UNAME
-        <if test="null != product.productName and ''!= product.productName">
-            and  product_name like concat(concat('%',#{product.productName}),'%')
-        </if>
-        <if test="null != product.productId and ''!= product.productId">
-            and  project_number like concat(concat('%',#{product.productId}),'%')
-        </if>
         ORDER BY
         PRODUCT_NAME ASC
     </select>