修改短信发送逻辑

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

@@ -331,9 +331,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         sysUser.setPhone(studentRegistration.getParentsPhone());
         sysUser.setOrganId(studentRegistration.getOrganId());
-        sysUser.setRealName(studentRegistration.getParentsName());
 
-        sysUser.setUsername(studentRegistration.getName());
+        Boolean updateNameFlag = false;
+        if (sysUser.getRealName() == null) {
+            sysUser.setRealName(studentRegistration.getParentsName());
+        }
+
+        if (sysUser.getUsername() == null) {
+            sysUser.setUsername(studentRegistration.getName());
+            updateNameFlag = true;
+        }
         sysUser.setGender(studentRegistration.getGender());
         sysUser.setBirthdate(studentRegistration.getBirthdate());
         sysUser.setCreateTime(date);
@@ -362,8 +369,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         student.setCurrentGradeNum(studentRegistration.getCurrentGradeNum());
         student.setCurrentClass(studentRegistration.getCurrentClass());
         studentDao.update(student);
-        imGroupDao.updateNickname(userId, studentRegistration.getName());
-        imGroupDao.updateUserFriendNickname(userId, studentRegistration.getName());
+
+        if (updateNameFlag) {
+            imGroupDao.updateNickname(userId, studentRegistration.getName());
+            imGroupDao.updateUserFriendNickname(userId, studentRegistration.getName());
+        }
+
         imFeignService.update(new ImUserModel(userId.toString(), studentRegistration.getName(), sysUser.getAvatar()));
         // 增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(), 1);
@@ -1813,6 +1824,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     public List<Map<String, Integer>> countNormalNum(List<String> musicGroupIds) {
-        return studentRegistrationDao.countNormalNum(StringUtils.join(musicGroupIds,","));
+        return studentRegistrationDao.countNormalNum(StringUtils.join(musicGroupIds, ","));
     }
 }