Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into sys_coupon

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -3,10 +3,12 @@ package com.ym.mec.cms.controller;
 import com.ym.mec.cms.dal.dao.StudentRegistrationDao;
 import com.ym.mec.cms.dal.entity.SysConfig;
 import com.ym.mec.cms.service.SysConfigService;
+import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -59,7 +61,9 @@ public class NewsController extends BaseController {
 
 	@Autowired
 	private SysConfigService sysConfigService;
-	
+
+	private final LocalDate xiaMenBannerStartShowTime = LocalDate.parse("2021-10-01", DateUtil.dateFormatter);
+
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/list")
 	public Object getList(NewsInformationQueryInfo queryInfo) {
@@ -82,15 +86,23 @@ public class NewsController extends BaseController {
 		if(Objects.nonNull(cloudTeacherActiveIds)&&StringUtils.isNotBlank(cloudTeacherActiveIds.getParanValue())){
 			excludeIds = Arrays.stream(cloudTeacherActiveIds.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toList());
 		}
+
 		if (user == null || user.getId() == null) {
 			queryInfo.setOrganId(43);
 			queryInfo.setExcludeIds(excludeIds);
 		} else {
 			queryInfo.setOrganId(user.getOrganId());
 			int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
+
 			if(memberGroupNum>0){
 				queryInfo.setExcludeIds(excludeIds);
 			}
+
+			//厦门学员
+			boolean xiaMenNotShow = user.getOrganId()==40&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
+			if(xiaMenNotShow){
+				queryInfo.setExcludeIds(null);
+			}
 		}
 		
 		Map<String, Object> params = new HashMap<String, Object>();
@@ -140,6 +152,12 @@ public class NewsController extends BaseController {
 			if(memberGroupNum>0){
 				queryInfo.setExcludeIds(excludeIds);
 			}
+
+			//厦门学员
+			boolean xiaMenNotShow = user.getOrganId()==40&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
+			if(xiaMenNotShow){
+				queryInfo.setExcludeIds(null);
+			}
 		}
 		return succeed(sysNewsInformationService.getHomeList(user, queryInfo));
 	}

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

@@ -3536,6 +3536,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Override
     public MusicGroup getMusicGroupDetail(String musicGroupId) {
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        if(musicGroup == null){
+            throw new BizException("乐团信息不存在");
+        }
         musicGroup.setEducationalTeacherName(teacherDao.queryNameById(musicGroup.getEducationalTeacherId()));
         musicGroup.setTeamTeacherName(teacherDao.queryNameById(musicGroup.getTeamTeacherId()));
         musicGroup.setDirectorUserName(teacherDao.queryNameById(musicGroup.getDirectorUserId()));

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -625,6 +625,7 @@
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+        LEFT JOIN student stu ON sr.user_id_ = stu.user_id_
         <if test="classGroupId != null">
             LEFT JOIN class_group_student_mapper cgsm ON cgsm.music_group_id_ = sr.music_group_id_
         </if>

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

@@ -334,6 +334,9 @@ public class MusicGroupController extends BaseController {
 	@ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
 	public HttpResponseResult<Map<Integer,String>> getGradeList(String musicGroupId) {
 		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+		if (musicGroup == null) {
+			return failed("乐团信息不存在");
+		}
 		return succeed(organizationService.getGradeList(musicGroup.getOrganId()));
 	}