乐团档案

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPerformanceController.java

@@ -45,7 +45,7 @@ public class MusicGroupPerformanceController extends BaseController {
 					throw new BizException("请勿录入特殊字符");
 				}
 			}
-			musicGroupPerformance.setMusicGroupName(StringUtils.join(musicScoreNames,","));
+			musicGroupPerformance.setMusicScoreName(StringUtils.join(musicScoreNames,","));
 		}
 		return succeed(musicGroupPerformanceService.insert(musicGroupPerformance));
 	}
@@ -54,10 +54,14 @@ public class MusicGroupPerformanceController extends BaseController {
 	@PostMapping(value = "update")
 	@PreAuthorize("@pcs.hasPermissions('musicGroupPerformance/update')")
 	public Object update(MusicGroupPerformance musicGroupPerformance) {
-		if(StringUtils.isNotEmpty(musicGroupPerformance.getMusicScoreName())){
-			if(musicGroupPerformance.getMusicScoreName().contains(",")){
-				throw new BizException("请勿录入特殊字符");
+		List<String> musicScoreNames = musicGroupPerformance.getMusicScoreNames();
+		if(musicScoreNames != null && musicScoreNames.size() > 0){
+			for (String musicScoreName : musicScoreNames) {
+				if(musicScoreName.contains(",")){
+					throw new BizException("请勿录入特殊字符");
+				}
 			}
+			musicGroupPerformance.setMusicScoreName(StringUtils.join(musicScoreNames,","));
 		}
 		return succeed(musicGroupPerformanceService.update(musicGroupPerformance));
 	}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupPerformanceController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RequestMapping("eduMusicGroupPerformance")
 @Api(tags = "乐团展演信息")
 @RestController
@@ -35,10 +37,14 @@ public class EduMusicGroupPerformanceController extends BaseController {
 			throw new BizException("请登录");
 		}
 		musicGroupPerformance.setOperator(sysUser.getId());
-		if(StringUtils.isNotEmpty(musicGroupPerformance.getMusicScoreName())){
-			if(musicGroupPerformance.getMusicScoreName().contains(",")){
-				throw new BizException("请勿录入特殊字符");
+		List<String> musicScoreNames = musicGroupPerformance.getMusicScoreNames();
+		if(musicScoreNames != null && musicScoreNames.size() > 0){
+			for (String musicScoreName : musicScoreNames) {
+				if(musicScoreName.contains(",")){
+					throw new BizException("请勿录入特殊字符");
+				}
 			}
+			musicGroupPerformance.setMusicScoreName(StringUtils.join(musicScoreNames,","));
 		}
 		return succeed(musicGroupPerformanceService.insert(musicGroupPerformance));
 	}
@@ -46,10 +52,14 @@ public class EduMusicGroupPerformanceController extends BaseController {
 	@ApiOperation("修改")
 	@PostMapping(value = "update")
 	public Object update(@RequestBody MusicGroupPerformance musicGroupPerformance) {
-		if(StringUtils.isNotEmpty(musicGroupPerformance.getMusicScoreName())){
-			if(musicGroupPerformance.getMusicScoreName().contains(",")){
-				throw new BizException("请勿录入特殊字符");
+		List<String> musicScoreNames = musicGroupPerformance.getMusicScoreNames();
+		if(musicScoreNames != null && musicScoreNames.size() > 0){
+			for (String musicScoreName : musicScoreNames) {
+				if(musicScoreName.contains(",")){
+					throw new BizException("请勿录入特殊字符");
+				}
 			}
+			musicGroupPerformance.setMusicScoreName(StringUtils.join(musicScoreNames,","));
 		}
 		return succeed(musicGroupPerformanceService.update(musicGroupPerformance));
 	}