Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml

@@ -105,10 +105,10 @@
             user_badge_certificate_record
         WHERE
             DEL_FLAG = 0
-            AND IS_LAST = 'yes'
             AND BADGE_ID = #{badgeId}
             <if test="userId != null and userId != '' ">
                 AND USER_ID = #{userId}
+                AND IS_LAST = 'yes'
             </if>
             <if test="recordId != null and recordId != ''">
                 AND ID = #{recordId}