审核未通过

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -185,8 +185,8 @@
         </if>
         ) temp
         ORDER BY temp.actCurrentState ASC
-        <if test='actType != null and actType != "" and actType == "0"'> ,temp.PUBLISH_TIME DESC </if>
+        <if test='actType != null and actType != "" and actType == "0"'>,temp.PUBLISH_TIME DESC</if>
-        <if test='actType != null and actType != "" and actType == "1"'> ,temp.ACT_START_TIME ASC</if>
+        <if test='actType != null and actType != "" and actType == "1"'>,temp.ACT_START_TIME ASC</if>
         LIMIT #{pageIndex},#{pageSize}
     </select>
     <select id="signupListItemsByApp" resultMap="actAppResultMap">
@@ -228,7 +228,8 @@
         and relation.USER_ID = #{userId}
         and relation.STATUS != '3'
         and actInfo.ID = relation.ACT_ID
-        LEFT JOIN ( SELECT count( * ) AS clockCount, ACT_USER_ID FROM epdc_act_user_clock_log WHERE DEL_FLAG = '0' GROUP BY ACT_USER_ID ) clock ON clock.ACT_USER_ID = relation.ID
+        LEFT JOIN ( SELECT count( * ) AS clockCount, ACT_USER_ID FROM epdc_act_user_clock_log WHERE DEL_FLAG = '0' GROUP
+        BY ACT_USER_ID ) clock ON clock.ACT_USER_ID = relation.ID
         WHERE
         actInfo.DEL_FLAG = '0'
         and relation.USER_ID = #{userId}
@@ -403,9 +404,11 @@
         left join epdc_act_user_relation relation on aul.ACT_USER_RELATION_ID = relation.id and relation.DEL_FLAG = '0'
         left join epdc_act_info actInfo on actInfo.ID = relation.ACT_ID and actInfo.DEL_FLAG = '0'
         WHERE
-        aul.DEL_FLAG = '0' AND aul.ID = #{id}
+        aul.DEL_FLAG = '0'
+        AND actInfo.id = #{id}
         ORDER BY
-        actInfo.CREATED_TIME DESC
+            aul.CREATED_TIME DESC
+        limit 1
     </select>
     <select id="getCancelDetailByApp" resultMap="actDetailAppResultMap">
         SELECT