Merge remote-tracking branch 'origin/master'

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

@@ -229,19 +229,17 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new Exception("身份校验失败");
         }
         String musicGroupId = subFeeSettingDto.getMusicGroupId();
-
         //乐团状态是否正确
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if(musicGroup != null){
-            if(musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT && musicGroup.getStatus() != MusicGroupStatusEnum.AUDIT_FAILED){
-                throw new Exception("当前乐团状态不支持此操作");
-            }
             if(subFeeSettingDto.getMusicGroupStatus() == null){
                 throw new Exception("参数校验异常");
             }
-            musicGroup.setStatus(subFeeSettingDto.getMusicGroupStatus());
-            musicGroup.setUpdateTime(new Date());
-            musicGroupDao.update(musicGroup);
+            if(musicGroup.getStatus() == MusicGroupStatusEnum.DRAFT || musicGroup.getStatus() == MusicGroupStatusEnum.AUDIT_FAILED){
+                musicGroup.setStatus(subFeeSettingDto.getMusicGroupStatus());
+                musicGroup.setUpdateTime(new Date());
+                musicGroupDao.update(musicGroup);
+            }
             //记录日志信息
             musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"修改乐团计划声部、乐器",sysUser.getId(), JSONObject.toJSONString(subFeeSettingDto)));
             //删除原有的乐团声部规划