Merge branch 'feature/1019-tenant' into develop-new

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

@@ -490,17 +490,20 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             int msgRowNo = rowIndex + 1;
             student.checkValid().forEach(err -> errMsg.add(String.format("第%s行%s", msgRowNo, err)));
 
-            if (phoneMap.containsKey(student.getPhone())) {
-                errMsg.add(String.format("第%s行手机号重复", msgRowNo));
-            } else {
-                phoneMap.put(student.getPhone(), msgRowNo);
+            if (StringUtils.isNotEmpty(student.getPhone())) {
+                if (phoneMap.containsKey(student.getPhone())) {
+                    errMsg.add(String.format("第%s行手机号重复", msgRowNo));
+                } else {
+                    phoneMap.put(student.getPhone(), msgRowNo);
+                }
             }
 
-            if (!subjectNames.contains(student.getSubjectName())) {
+            if (StringUtils.isNotEmpty(student.getSubjectName()) && !subjectNames.contains(student.getSubjectName())) {
                 errMsg.add(String.format("第%s行声部不支持", msgRowNo));
             }
 
-            if (!groupNameIdMap.containsKey(student.getTenantGroupName())) {
+            if (StringUtils.isNotEmpty(student.getTenantGroupName()) &&
+                    !groupNameIdMap.containsKey(student.getTenantGroupName())) {
                 errMsg.add(String.format("第%s行小组不存在", msgRowNo));
             }
 
@@ -689,7 +692,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         boolean updatePhone = false;
         if (!student.getPhone().equals(studentInfo.getPhone())) {
             updatePhone = true;
-            com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = getOrCreateAccount(studentInfo);
+            SysUser oldSysUser = sysUserMapper.getByUserId(studentInfo.getId());
+            com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = getOrCreateAccount(studentInfo, oldSysUser.getPassword());
             this.lambdaUpdate().set(Student::getSubjectId, studentInfo.getSubjectId())
                     .set(Student::getTenantId, studentInfo.getTenantId())
                     .set(Student::getUserId, sysUser.getId())
@@ -809,7 +813,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             avatar = sysConfigService.findConfigValue(SysConfigConstant.STUDENT_AVATAR);
             studentInfo.setAvatar(avatar);
         }
-        com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = getOrCreateAccount(studentInfo);
+        com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = getOrCreateAccount(studentInfo, null);
         Student student = new Student();
         student.setUserId(sysUser.getId());
         student.setTenantId(studentInfo.getTenantId());
@@ -858,7 +862,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         return true;
     }
 
-    private com.yonge.cooleshow.biz.dal.entity.SysUser getOrCreateAccount(StudentWrapper.Student studentInfo) {
+    private com.yonge.cooleshow.biz.dal.entity.SysUser getOrCreateAccount(StudentWrapper.Student studentInfo,
+                                                                          String password) {
         QueryWrapper<com.yonge.cooleshow.biz.dal.entity.SysUser> sysUserQueryWrapper = new QueryWrapper<>();
         sysUserQueryWrapper.lambda().eq(com.yonge.cooleshow.biz.dal.entity.SysUser::getPhone, studentInfo.getPhone());
         List<com.yonge.cooleshow.biz.dal.entity.SysUser> sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
@@ -894,10 +899,13 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             sysUser.setUserType("STUDENT");
             sysUser.setBirthdate(studentInfo.getBirthdate());
             sysUser.setUsername(studentInfo.getName());
-
-            String newPassword = MessageFormat.format("klx{0}", studentInfo.getPhone().substring(7));
-            String password = new BCryptPasswordEncoder().encode(newPassword);
             sysUser.setPassword(password);
+
+            if (StringUtils.isEmpty(password)) {
+                String newPassword = MessageFormat.format("klx{0}", studentInfo.getPhone().substring(7));
+                sysUser.setPassword(new BCryptPasswordEncoder().encode(newPassword));
+            }
+
             sysUserMapper.insert(sysUser);
         }
         return sysUser;

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

@@ -121,12 +121,12 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         String s = subjectType.toString();
         String type = query.getType();
         String level = query.getLevel();
-        String keyword = query.getKeyword();
 
         List<Long> musicSheetIds = tenantAlbumMusicMapper.selectMusicSheetIds(albumId, s, type, level);
 
-        if (CollectionUtils.isEmpty(musicSheetIds)){
-            throw new BizException("该声部下没有相关曲目");
+        if (CollectionUtils.isEmpty(musicSheetIds)) {
+            page.setTotal(0);
+            return page.setRecords(new ArrayList<>());
         }
         TenantAlbumMusicWrapper.StudentMusicSheetQuery musicSheetQuery = new TenantAlbumMusicWrapper.StudentMusicSheetQuery();
         musicSheetQuery.setMusicSheetIds(musicSheetIds);