Merge branch 'dev_1_2_20220802'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -359,7 +359,7 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
             receivers.put(userId, user.getPhone());
 
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.ACTIVITY_JOIN_MESSAGE, receivers, null,
-                    0, null, ClientEnum.STUDENT.getCode(), user.getUsername(), activityName);
+                    0, null, ClientEnum.STUDENT.getCode(), activityName);
 
         } catch (Exception e) {
             log.error("活动参与发送消息失败--> {}", e.fillInStackTrace());

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityEvaluationMapper.xml

@@ -74,7 +74,7 @@
         left join music_sheet ms on ms.id_ = ae.music_sheet_id_
         left join subject s on s.id_ = ms.music_subject_
         <where>
-            ms.del_flag_ = 0 and ms.state_ = 1
+            ms.del_flag_ = 0
             <if test="activityPlanId != null">
                 and ae.activity_id_ = #{activityPlanId}
             </if>