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

peng

2 天以前 62b3e99c68eb75a2c5cd86eb748534bd266ad009

 framework/src/main/resources/mapper/lmk/ActivityMapper.xml

@@ -128,10 +128,7 @@
            LA.activity_location,
            LA.activity_content,
            LA.publish,
            CASE WHEN EXISTS (
            SELECT 1 FROM lmk_activity_audit_record
            WHERE activity_id = LA.id AND delete_flag = 0 AND audit != 0
            ) THEN 1 ELSE 0 END AS auditStatus
            LAAR.audit as auditStatus
        FROM
            lmk_activity LA
        LEFT JOIN
@@ -244,10 +241,17 @@
            LA.activity_location,
            LA.activity_content
        FROM
            lmk_activity LA inner join lmk_activity_audit_record LAAR ON LA.id = LAAR.activity_id and LAAR.delete_flag = 0 and LAAR.audit = 1
            lmk_activity LA
        WHERE
            LA.delete_flag = 0
          AND LA.publish = 1
          AND EXISTS (
            SELECT 1
            FROM lmk_activity_audit_record LAAR
            WHERE LA.id = LAAR.activity_id
              AND LAAR.delete_flag = 0
              AND LAAR.audit = 1
        )
    </select>