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

mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -349,7 +349,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "获取用户所在分部的年级列表）")
     @GetMapping("studentManage/getGradeList")
     public HttpResponseResult<Map<Integer,String>> getGradeList() {
-        return succeed(organizationService.getGradeList(sysUserService.getUserId()));
+        return succeed(organizationService.getGradeList(sysUserService.getUser().getOrganId()));
     }
 
     @ApiOperation(value = "url短链接")

mec-application/src/main/java/com/ym/mec/student/controller/UserMusicController.java

@@ -76,7 +76,7 @@ public class UserMusicController  extends BaseController {
 
     @ApiOperation(value = "保存草稿/发布作品", notes = "用户曲目作品- 传入 UserMusicWrapper.UserMusic")
     @PostMapping("/save")
-    public HttpResponseResult<JSONObject> add(@Validated @RequestBody UserMusicWrapper.AddUserMusic userMusic) {
+    public HttpResponseResult<Long> add(@Validated @RequestBody UserMusicWrapper.AddUserMusic userMusic) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
@@ -84,9 +84,9 @@ public class UserMusicController  extends BaseController {
         userMusic.setUserId(user.getId().longValue());
         userMusic.setClientType(ClientEnum.STUDENT);
         // 新增数据
-        userMusicService.save(userMusic);
+        ;
 
-        return succeed();
+        return succeed(userMusicService.save(userMusic));
     }
 
     @ApiOperation(value = "删除", notes = "用户曲目作品- 传入id")

mec-biz/src/main/java/com/ym/mec/biz/service/UserMusicService.java

@@ -56,7 +56,7 @@ public interface UserMusicService extends IService<UserMusic>  {
      * 保存草稿/发布作品
      *
      */
-    void save(UserMusicWrapper.AddUserMusic userMusic);
+    Long save(UserMusicWrapper.AddUserMusic userMusic);
 
     /**
      * 分页

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

@@ -690,6 +690,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         }
         //课程教师课酬
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedulesWithNoSettlement(courseScheduleIds);
+        if(CollectionUtils.isEmpty(courseScheduleTeacherSalaries)){
+            return;
+        }
 
         Set<Integer> schoolIds = yesterdayCourseSchedules.stream().map(CourseSchedule::getSchoolId).collect(Collectors.toSet());
         Map<Integer, School> idSchoolMap = new HashMap<>();

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

@@ -141,7 +141,7 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(UserMusicWrapper.AddUserMusic userMusic) {
+    public Long save(UserMusicWrapper.AddUserMusic userMusic) {
 
         // 设置曲目ID
         if (userMusic.getMusicPracticeRecordId() != null) {
@@ -195,6 +195,7 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
             entity.setSubmitTime(new Date());
         }
         userMusicService.saveOrUpdate(entity);
+        return entity.getId();
     }
 
     /**