Merge branch 'activity_2020_12'

mec-biz/src/main/resources/config/mybatis/DegreeRegistrationMapper.xml

@@ -247,6 +247,7 @@
             user_id_ = #{degree.userId}
             AND activity_tag_=#{degree.activityTag}
             AND (sporadic_id_ = #{degree.sporadicId} OR theory_level_ = #{degree.theoryLevel})
+            AND status_=1
     </select>
 
     <select id="getUserLevelDegrees" resultMap="DegreeRegistration">