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

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

@@ -451,16 +451,19 @@ public class GroupClassServiceImpl implements GroupClassService {
                 }
                 Student student = studentDao.get(studentId);
                 Date membershipEndTime = student.getMembershipEndTime();
-                if(membershipEndTime.compareTo(now) > 0){
-                    membershipEndTime = DateUtil.addDays(membershipEndTime, -giveMemberTime);
-                    student.setMembershipEndTime(membershipEndTime);
-                    if(membershipEndTime.compareTo(now) < 0){
-                        student.setMemberRankSettingId(null);
-                        student.setExperienceMemberRankSettingId(null);
+                if(membershipEndTime != null){
+                    if(membershipEndTime.compareTo(now) > 0){
+                        membershipEndTime = DateUtil.addDays(membershipEndTime, -giveMemberTime);
+                        student.setMembershipEndTime(membershipEndTime);
+                        if(membershipEndTime.compareTo(now) < 0){
+                            student.setMemberRankSettingId(null);
+                            student.setExperienceMemberRankSettingId(null);
+                        }
+                        student.setUpdateTime(now);
+                        studentDao.updateStudentMember(student);
                     }
-                    student.setUpdateTime(now);
-                    studentDao.updateStudentMember(student);
                 }
+
                 CloudTeacherOrder cloudTeacherOrder = cloudTeacherOrderDao.get(giveMemberOrderId);
                 cloudTeacherOrder.setStatus(3);
                 cloudTeacherOrder.setRemark("退还活动关联会员时长");

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

@@ -169,6 +169,7 @@
             </if>
         </if>
         <include refid="findStudentsByOrganIdSql"/>
+        GROUP BY su.id_
         ORDER BY su.create_time_ DESC
         <include refid="global.limit"/>
     </select>