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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrderPayOpsServiceImpl.java

@@ -177,6 +177,9 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     // 团练宝激活支付
     private Map<String, Object> cloudTeacherOrder(PaymentParam payParam) {
         TenantOrderRecord tenantOrderRecord = getTenantOrderRecord(payParam.getOrderNo());
+        if (tenantOrderRecord.getOrderState() == 1) {
+            throw new BizException("订单已完成支付.");
+        }
         Map<String, Object> payment = checkOrderGetPayment(payParam, tenantOrderRecord);
         // 团练宝激活支付 主动延迟检查订单
         log.info("executePayment delayCheckCloudTeacherOrder >>>>> ");

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

@@ -77,10 +77,10 @@
 		<where>
             mgn.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
-				mgn.music_group_id_ = #{search}
+				and mgn.music_group_id_ = #{search}
 			</if>
 			<if test="musicGroupId != null and musicGroupId != ''">
-				mgn.music_group_id_ = #{musicGroupId}
+				and mgn.music_group_id_ = #{musicGroupId}
 			</if>
 		</where>
 		ORDER BY mgn.id_ DESC
@@ -93,10 +93,10 @@
 		<where>
             mgn.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
-				mgn.music_group_id_ = #{search}
+				and mgn.music_group_id_ = #{search}
 			</if>
 			<if test="musicGroupId != null and musicGroupId != ''">
-				mgn.music_group_id_ = #{musicGroupId}
+				and mgn.music_group_id_ = #{musicGroupId}
 			</if>
 		</where>
 	</select>