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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml

@@ -39,14 +39,14 @@
             ifnull((
                 SELECT count(1) FROM hygf_acceptance_rectification_order aro WHERE aro.peasant_household_id = bga.peasant_household_id
             ), 0) AS rectificationOrderCount,
-            ifnull((
+            (
                SELECT
                 CASE WHEN aro.rectification_status  = '1' THEN '待整改'
                 WHEN aro.rectification_status  = '2' THEN '整改未完成'
                 WHEN aro.rectification_status  = '3' THEN '整改已完成'
                 ELSE '' END AS rectificationStatus
                FROM hygf_acceptance_rectification_order aro WHERE aro.peasant_household_id = bga.peasant_household_id ORDER BY rec_date DESC LIMIT 1
-            ), 0) AS rectificationStatus
+            ) AS rectificationStatus
         FROM
             hygf_basic_grid_acceptance bga
                 LEFT JOIN hygf_peasant_household ph ON ph.sequence_nbr = bga.peasant_household_id