This commit is contained in:
zhouwentao 2025-06-25 15:49:06 +08:00
parent 4fc2127be3
commit 2bfb2d5264
1 changed files with 3 additions and 3 deletions

View File

@ -117,8 +117,8 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
key2+= h.getMajorType();
if ("表演类".equals(h.getMajorType())) {
key = h.getMajorTypeChild() + "_";
key = key + "-" + h.getMajorTypeChild();
key = h.getMajorTypeChild();
key2 = key2 +"-"+ h.getMajorTypeChild();
}else if ("音乐类".equals(h.getMajorType())) {
key = h.getMajorTypeChild();
key2 = key2 +"-"+ h.getMajorTypeChild();
@ -146,7 +146,7 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
for (String year : historyYearsList) {
key = "";
if ("表演类".equals(recommendMajorDTO.getMajorType())) {
key = recommendMajorDTO.getMajorTypeChild() + "_";
key = recommendMajorDTO.getMajorTypeChild();
}else if ("音乐类".equals(recommendMajorDTO.getMajorType())) {
key = recommendMajorDTO.getMajorTypeChild();
if (!"音乐教育".equals(recommendMajorDTO.getMajorTypeChild())) {