Merge branch 'feature/1022_vip' into test

mec-application/src/main/java/com/ym/mec/web/controller/MemberRankSettingController.java

@@ -105,6 +105,7 @@ public class MemberRankSettingController extends BaseController {
             queryInfo.setRows(1000);
             queryInfo.setPage(1);
             if (CollectionUtils.isNotEmpty(organIds)) {
+
                 queryInfo.setOrganId(StringUtils.join(organIds, ","));
             }
             List<MemberRankOrganizationFeeMapper> rows = memberRankOrganizationFeeMapperService.queryPage(queryInfo).getRows();

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

@@ -28,7 +28,10 @@ public class StudentMemberTimeServiceImpl extends ServiceImpl<StudentMemberTimeD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveToCloudTeacherOrder(CloudTeacherOrder cloudTeacherOrder) {
-        StudentMemberTime one = this.lambdaQuery().eq(StudentMemberTime::getMemberRankId, cloudTeacherOrder.getLevel()).last("limit 1").one();
+        StudentMemberTime one = this.lambdaQuery()
+            .eq(StudentMemberTime::getMemberRankId, cloudTeacherOrder.getLevel())
+            .eq(StudentMemberTime::getStudentId, cloudTeacherOrder.getStudentId())
+            .last("limit 1").one();
         if (one == null) {
             one = new StudentMemberTime();
             one.setMemberRankId(cloudTeacherOrder.getLevel());

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

@@ -89,7 +89,9 @@
 		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
 		LEFT JOIN sys_user su ON su.id_ = mrofm.operator_id_
 		<where>
-			mrofm.tenant_id_ = #{tenantId}
+			<if test="tenantId != null">
+				AND mrofm.tenant_id_ = #{tenantId}
+			</if>
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
 			</if>