Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageListDto.java

@@ -18,6 +18,11 @@ public class StudentManageListDto {
     @ApiModelProperty(value = "用户名",required = false)
     private String realName;
 
+    @ApiModelProperty(value = "用户名",required = false)
+    private String username;
+
+    private String nation;
+
     @ApiModelProperty(value = "性别",required = false)
     private UserGenderEnum gender;
 
@@ -39,6 +44,22 @@ public class StudentManageListDto {
     @ApiModelProperty(value = "课程余额")
     private BigDecimal courseBalance;
 
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
     public BigDecimal getCourseBalance() {
         return courseBalance;
     }

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

@@ -150,7 +150,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Transactional(rollbackFor = Exception.class)
     public ClassGroup addClassGroup(ClassGroup classGroup, GroupType groupType) throws Exception {
         String userIds = classGroup.getUserIds();
-        if (userIds == null || userIds.isEmpty()) throw new Exception("班级学生不能为空");
+        if (userIds == null || userIds.isEmpty()) throw new BizException("班级学生不能为空");
 
         Set<String> userIdStrSet = new HashSet<>(Arrays.asList(userIds.split(",")));
 
@@ -810,24 +810,24 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     public void addMusicGroupTeam(Integer teacherId, String musicGroupId, Integer improventClassesNum) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            throw new Exception("用户信息获取失败");
+            throw new BizException("用户信息获取失败");
         }
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if (musicGroup == null) {
-            throw new Exception("乐团信息不存在");
+            throw new BizException("乐团信息不存在");
         }
         if (musicGroup.getStatus() != MusicGroupStatusEnum.PREPARE) {
-            throw new Exception("当前乐团状态不允许此操作");
+            throw new BizException("当前乐团状态不允许此操作");
         }
         //所有学员都已经分配
         List<StudentRegistration> students = studentRegistrationDao.getNoClassStuBySubjectId(musicGroupId, null);
         if (students != null && students.size() > 0) {
-            throw new Exception("还有学员未分配班级");
+            throw new BizException("还有学员未分配班级");
         }
         //所有单技班都有合奏班
         List<ClassGroup> classGroupList = classGroupDao.findNoClassSubjects(musicGroupId);
         if (classGroupList != null && classGroupList.size() > 0) {
-            throw new Exception("还有单技班未分配合奏");
+            throw new BizException("还有单技班未分配合奏");
         }
         //设置教学主管
         musicGroup.setDirectorUserId(teacherId);
@@ -1040,8 +1040,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         String musicGroupId = classGroup4MixDto.getMusicGroupId();
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if (musicGroup == null) {
-            throw new Exception("乐团不存在");
-        }Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
+            throw new BizException("乐团不存在");
+        }
+        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
         Integer schoolId = musicGroup.getSchoolId();
 
         List<Integer> studentIdList = classGroup4MixDto.getStudents();
@@ -1290,7 +1291,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         Date date = new Date();
         ClassGroup classGroup = classGroupDao.get(classGroup4MixDto.getClassGroupId());
         if (classGroup == null) {
-            throw new Exception("班级不存在");
+            throw new BizException("班级不存在");
         }
         Integer courseTimes = classGroup4MixDto.getCourseTimes();
 
@@ -1529,7 +1530,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         String musicGroupId = classGroup4MixDto.getMusicGroupId();
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if (musicGroup == null) {
-            throw new Exception("乐团不存在");
+            throw new BizException("乐团不存在");
         }
         Integer schoolId = musicGroup.getSchoolId();
 

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.http.HttpUtil;
@@ -57,7 +58,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
     public boolean delClassGroupStudent(Integer userId, Integer classGroupId) throws Exception {
         ClassGroupStudentMapper classStudentMapper = findClassStudentMapperByUserIdAndClassGroupId(userId, classGroupId,"NORMAL");
         if (classStudentMapper == null) {
-            throw new Exception("班级学生不存在");
+            throw new BizException("班级学生不存在");
         }
         //1、删除班级学生对应班级关系
         classStudentMapper.setStatus(ClassGroupStudentStatusEnum.QUIT);
@@ -96,7 +97,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
     public boolean adjustClassGroup(Integer userId, Integer oldClassGroupId, Integer classGroupId) throws Exception {
         ClassGroupStudentMapper classStudentMapper = findClassStudentMapperByUserIdAndClassGroupId(userId, oldClassGroupId,"NORMAL");
         if (classStudentMapper == null) {
-            throw new Exception("原班级学生不存在");
+            throw new BizException("原班级学生不存在");
         }
         Date date = new Date();
         //1、更新学生对应班级关系
@@ -140,7 +141,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
     public boolean addStudents(Integer classGroupId, String userIdsStr, GroupType groupType) throws Exception {
         ClassGroup classGroup = classGroupService.get(classGroupId);
         if (classGroup == null) {
-            throw new Exception("添加学员的班级不存在");
+            throw new BizException("添加学员的班级不存在");
         }
         Date nowDate = new Date();
         HashSet<String> userIdStrSet = new HashSet<>(Arrays.asList(userIdsStr.split(",")));

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

@@ -130,7 +130,7 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 	public DemoGroup getDemoGroupByTeacherId() throws Exception {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(user == null){
-			throw new Exception("获取用户信息失败");
+			throw new BizException("获取用户信息失败");
 		}
 		return demoGroupDao.findDemoGroupByTeacherId(user.getId());
 	}

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

@@ -131,7 +131,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	public PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws Exception {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if(user == null){
-			throw new Exception("获取用户信息失败");
+			throw new BizException("获取用户信息失败");
 		}
 		PageInfo<EmployeeDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<>();

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

@@ -248,7 +248,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         String musicGroupId = idGeneratorService.generatorId() + "";
         musicGroup.setId(musicGroupId);
         if(musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT && musicGroup.getStatus() != MusicGroupStatusEnum.AUDIT){
-            throw new Exception("乐团初始状态错误");
+            throw new BizException("乐团初始状态错误");
         }
         // 保存乐团基本信息
         musicGroupDao.insert(musicGroup);
@@ -631,14 +631,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public void updateSubjectInfo(SubFeeSettingDto subFeeSettingDto) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
-            throw new Exception("身份校验失败");
+            throw new BizException("身份校验失败");
         }
         String musicGroupId = subFeeSettingDto.getMusicGroupId();
         //乐团状态是否正确
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if(musicGroup != null){
             if(subFeeSettingDto.getMusicGroupStatus() == null){
-                throw new Exception("参数校验异常");
+                throw new BizException("参数校验异常");
             }
             if(musicGroup.getStatus() == MusicGroupStatusEnum.DRAFT || musicGroup.getStatus() == MusicGroupStatusEnum.AUDIT_FAILED){
                 musicGroup.setStatus(subFeeSettingDto.getMusicGroupStatus());
@@ -671,7 +671,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				musicGroupSubjectGoodsGroupDao.batchInsert(subFeeSettingDto.getMusicGroupSubjectGoodsGroups(), musicGroupId);
             }
         }else {
-            throw new Exception("乐团信息不存在");
+            throw new BizException("乐团信息不存在");
         }
     }
 
@@ -688,7 +688,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public void musicGroupAction(String musicGroupId) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
-            throw new Exception("用户信息获取失败");
+            throw new BizException("用户信息获取失败");
         }
         MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.PREPARE);
         //乐器采购清单是否确认
@@ -696,13 +696,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         param.put("musicGroupId",musicGroupId);
         int i = musicGroupPurchaseListDao.queryCount(param);
         if(i <= 0){
-            throw new Exception("采购清单未确认");
+            throw new BizException("采购清单未确认");
         }
         //课酬是否确认
         Integer courseScheduleNum = courseScheduleDao.countCourseScheduleByMusicGroupId(musicGroupId);
         if(courseScheduleNum != null && courseScheduleNum > 0){
             if(classGroupService.checkSetSalary(musicGroupId) == false){
-                throw new Exception("课酬未确认");
+                throw new BizException("课酬未确认");
             }
         }
         //生成学员费用表
@@ -738,10 +738,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Date date = new Date();
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if(musicGroup == null){
-            throw new Exception("乐团信息不存在");
+            throw new BizException("乐团信息不存在");
         }
         if(musicGroup.getStatus() != statusEnum){
-            throw new Exception("当前乐团状态不支持此操作");
+            throw new BizException("当前乐团状态不支持此操作");
         }
         musicGroup.setUpdateTime(date);
         return musicGroup;
@@ -752,7 +752,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public void musicGroupAudit(String musicGroupId) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
-            throw new Exception("用户信息获取失败");
+            throw new BizException("用户信息获取失败");
         }
         MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.DRAFT);
         //记录操作日志
@@ -770,7 +770,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public void musicGroupAuditFailed(String musicGroupId,String memo) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
-            throw new Exception("用户信息获取失败");
+            throw new BizException("用户信息获取失败");
         }
         MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.AUDIT);
         //记录操作日志
@@ -785,7 +785,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public void musicGroupAuditSuccess(String musicGroupId) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
-            throw new Exception("用户信息获取失败");
+            throw new BizException("用户信息获取失败");
         }
         MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.AUDIT);
         //记录操作日志
@@ -1564,13 +1564,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public void updateBaseInfo(SubFeeSettingDto subFeeSettingDto) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
-            throw new Exception("用户信息获取失败");
+            throw new BizException("用户信息获取失败");
         }
         String musicGroupId = subFeeSettingDto.getMusicGroup().getId();
         MusicGroup group = musicGroupDao.get(musicGroupId);
         MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
         if(group == null){
-            throw new Exception("乐团信息不存在");
+            throw new BizException("乐团信息不存在");
         }else if(group.getSchoolId() != musicGroup.getSchoolId()){
             //如果已生成课表，那么修改未上课时教学点
             courseScheduleDao.updateCourseScheduleSchool("MUSIC",musicGroupId,musicGroup.getSchoolId());
@@ -1585,7 +1585,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             musicGroupPaymentCalenderDao.batchAdd(months,musicGroupId);
             Integer num = musicGroupStudentFeeDao.countStudentNoPayNum(musicGroupId);
             if(num > 0){
-                throw new Exception("缴费周期更新失败，当前乐团有未缴费的学员");
+                throw new BizException("缴费周期更新失败，当前乐团有未缴费的学员");
             }
             //修改学员下次缴费日期
             musicGroupStudentFeeDao.updateNextPaymentDate(musicGroupId,musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId));
@@ -1643,7 +1643,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public MusicGroup openPay(String musicGroupId, String expireDate) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
-            throw new Exception("用户信息获取失败");
+            throw new BizException("用户信息获取失败");
         }
         MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.APPLY);
         //记录操作日志
@@ -1716,7 +1716,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public void musicGroupFound(String musicGroupId) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
-            throw new Exception("用户信息获取失败");
+            throw new BizException("用户信息获取失败");
         }
         MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.PAY);
         //记录操作日志

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.common.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,7 +42,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	public List<Organization> queryEmployeeOrgan() throws Exception {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if(sysUser == null){
-			throw new Exception("获取用户信息失败");
+			throw new BizException("获取用户信息失败");
 		}
 		Integer userId = sysUser.getId();
 		if(sysUser.getIsSuperAdmin()){

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

@@ -313,10 +313,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             throw new BizException("参数校验失败");
         }
         SysUser sysUser1 = sysUserFeignService.queryUserByMobile(sysUser.getPhone());
-        if(sysUser1 == null){
-            throw new BizException("用户不存在");
-        }
-        if(!userId.equals(sysUser1.getId())){
+        if(sysUser1 != null && !userId.equals(sysUser1.getId())){
             throw new BizException("手机号已被占用");
         }
         teacherDao.updateUser(sysUser);

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

@@ -131,7 +131,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //获取当前学员的当前声部
         StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
         if (studentRegistration == null) {
-            throw new Exception("学员信息不存在");
+            throw new BizException("学员信息不存在");
         }
         //批量调剂（未缴费学员）
         int i = studentRegistrationDao.batchUpdateSubject(userId, subId, musicGroupId);
@@ -479,16 +479,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     public Integer insertStudent(StudentAddDto studentAddDto) throws Exception {
         StudentRegistration studentRegistration = studentAddDto.getStudentRegistration();
         if (studentRegistration == null) {
-            throw new Exception("参数校验失败");
+            throw new BizException("参数校验失败");
         }
         if(studentAddDto.getSignClassId() == null && studentAddDto.getMixClassId() == null){
-            throw new Exception("参数校验失败: 单技班或合奏班必填一项");
+            throw new BizException("参数校验失败: 单技班或合奏班必填一项");
         }
         String musicGroupId = studentRegistration.getMusicGroupId();
 
         StudentRegistration phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(musicGroupId, studentRegistration.getParentsPhone());
         if (phoneAndMusicGroupId != null && phoneAndMusicGroupId.getMusicGroupStatus() != ClassGroupStudentStatusEnum.QUIT) {
-            throw new Exception("该学员已存在");
+            throw new BizException("该学员已存在");
         } else {
             SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
             MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
@@ -776,9 +776,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS, map, null, 0, "1",
                     studentRegistration.getParentsName(), studentPaymentOrder.getActualAmount());
             //push
-            map.put(studentPaymentOrder.getUserId(), studentPaymentOrder.getUserId().toString());
+            Map<Integer, String> map1 = new HashMap<>(1);
+            map1.put(studentPaymentOrder.getUserId(), studentPaymentOrder.getUserId().toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-                    MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS, map, null, 0, "1",
+                    MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS, map1, null, 0, "1",
                     studentRegistration.getParentsName(), studentPaymentOrder.getActualAmount());
         }
 

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

@@ -199,10 +199,10 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 				roleIds.add(SysUserRole.SECTION_MANAGER);
 				sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,sysUser.getOrganId()), MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_WITHDRAW,"",sysUser.getUsername());
 			} else {
-				throw new Exception("账户余额不足");
+				throw new BizException("账户余额不足");
 			}
 		} else {
-			throw new Exception("账户状态异常");
+			throw new BizException("账户状态异常");
 		}
 	}
 

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

@@ -86,7 +86,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 				}
 				teacherDao.updateUser(teacher);
 			}else {
-				throw new Exception("用户已存在");
+				throw new BizException("用户已存在");
 			}
 			return id;
 		}

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

@@ -256,7 +256,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(teacher.getOrganId().indexOf(",")!=-1){
 		    throw new BizException("教师部门异常");
         }
-        vipGroupApplyBaseInfoDto.setOrganId(Integer.parseInt(teacher.getOrganId()));
+//        vipGroupApplyBaseInfoDto.setOrganId(Integer.parseInt(teacher.getOrganId()));
 		//开课时间为排课的第一节课的开始时间
 		vipGroupApplyBaseInfoDto.setCourseStartDate(firstCourseSchedule.getStartClassTime());
 		//课程结束时间为排课的最后一节课的结束时间

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

@@ -5,9 +5,11 @@
     <resultMap id="studentManageListDto" type="com.ym.mec.biz.dal.dto.StudentManageListDto">
         <result property="userId" column="user_id_"/>
         <result property="realName" column="real_name_"/>
+        <result property="nation" column="nation_"/>
         <result property="parentsPhone" column="parents_phone_"/>
+        <result property="parentsName" column="real_name_"/>
         <result property="gender" column="gender_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="parentsName" column="parents_name_"/>
+        <result property="username" column="username_"/>
         <result property="birthdate" column="birthdate_"/>
         <result property="currentGrade" column="current_grade_"/>
         <result property="currentClass" column="current_class_"/>
@@ -118,7 +120,7 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT su.id_ user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,su.real_name_ parents_name_
+        SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,su.birthdate_,su.nation_
         FROM sys_user su
         <include refid="findStudentsByOrganIdSql"/>
         ORDER BY su.create_time_ DESC
@@ -146,8 +148,8 @@
         <include refid="findStudentsByOrganIdSql"/>
     </select>
     <select id="findStudentBaseInfoByUserID" resultMap="studentManageListDto">
-        SELECT su.username_ real_name_,su.gender_,su.birthdate_,sr.parents_name_,su.id_ user_id_,
-        sr.parents_phone_,sr.current_class_,sr.current_grade_
+        SELECT su.username_,su.gender_,su.birthdate_,sr.parents_name_ real_name_,su.id_ user_id_,
+        sr.parents_phone_,sr.current_class_,sr.current_grade_,su.nation_
         FROM sys_user su
         LEFT JOIN student_registration sr ON su.id_ = sr.user_id_
         WHERE su.id_ =#{userId} AND su.user_type_ = 'STUDENT' LIMIT 1

mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java

@@ -2,6 +2,7 @@ package com.ym.mec.common.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.ym.mec.common.exception.BizException;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -66,9 +67,12 @@ public class BaseController {
 		if (e == null) {
 			e = ex;
 		}
-
 		logger.error("System Error", e);
-		return failed(e.getMessage());
+//		return failed(e.getMessage());
+		if(ex instanceof BizException){
+			return failed(e.getMessage());
+		}
+		return failed("系统繁忙");
 	}
 
 }

mec-im/src/main/java/com/ym/service/Impl/HereWhiteServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.service.Impl;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.dao.HereWhiteDao;
 import com.ym.mec.biz.dal.entity.SysMessage;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.util.http.HttpUtil;
 import com.ym.pojo.HereWhite;
 import com.ym.service.HereWhiteService;
@@ -57,7 +58,7 @@ public class HereWhiteServiceImpl implements HereWhiteService {
             }
             return hereWhite;
         }else {
-            throw new Exception(jsonObject.getString("msg"));
+            throw new BizException(jsonObject.getString("msg"));
         }
     }
 

mec-util/src/main/java/com/ym/mec/util/http/HttpUtil.java

@@ -39,7 +39,7 @@ import com.ym.mec.util.compress.ZipUtil;
 public class HttpUtil {
 
 	public static String getSortUrl(String url){
-		try {
+		/*try {
 			Map<String,Object> paramMap = new HashMap<>();
 			paramMap.put("format","json");
 			paramMap.put("url",URLDecoder.decode(url,"UTF-8"));
@@ -48,7 +48,7 @@ public class HttpUtil {
 			return JSONObject.parseObject(s).getString("url");
 		}catch (Exception e){
 			e.printStackTrace();
-		}
+		}*/
 		return url;
 	}
 

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -135,7 +136,7 @@ public class MusicGroupController extends BaseController {
 			return failed("获取用户信息失败");
 		}
 		if(StringUtils.isEmpty(musicGroupId)){
-			throw new Exception("参数校验错误");
+			throw new BizException("参数校验错误");
 		}
 		musicGroupService.pushMessage(musicGroupId);
 		return succeed();

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

@@ -1,6 +1,7 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -56,7 +57,7 @@ public class MusicGroupSubjectPlanController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('musicGroupSubjectPlan/findSubjectPlan')")
     public Object findSubjectPlan(String musicGroupId,Integer subjectId) throws Exception {
         if(StringUtils.isEmpty(musicGroupId) || subjectId == null){
-            throw new Exception("参数校验失败");
+            throw new BizException("参数校验失败");
         }
         return succeed(musicGroupSubjectPlanService.findSubjectPlan(musicGroupId,subjectId));
     }

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

@@ -72,7 +72,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "修改学员信息")
     @PostMapping("/studentUpdate")
     @PreAuthorize("@pcs.hasPermissions('studentManage/studentUpdate')")
-    public Object studentUpdate(Integer id, String phone, String username, Integer gender, String realName, Date birthdate){
+    public Object studentUpdate(Integer id, String phone, String username, Integer gender, String realName, Date birthdate,String nation){
         SysUser sysUser = new SysUser();
         sysUser.setId(id);
         sysUser.setPhone(phone);
@@ -80,6 +80,7 @@ public class StudentManageController extends BaseController {
         sysUser.setGender(gender);
         sysUser.setRealName(realName);
         sysUser.setBirthdate(birthdate);
+        sysUser.setNation(nation);
         return succeed(studentManageService.studentUpdate(sysUser));
     }
 

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyBaseInfoDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
@@ -47,6 +48,8 @@ public class VipGroupManageController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
+    private TeacherDao teacherDao;
+    @Autowired
     private EmployeeDao employeeDao;
 
     @Autowired
@@ -59,15 +62,20 @@ public class VipGroupManageController extends BaseController {
     @PostMapping("/vipGroupApply")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/vipGroupApply')")
     public Object vipGroupApply(@RequestBody VipGroupApplyDto vipGroupApplyDto){
-        SysUser sysUser = sysUserFeignService.queryUserById(vipGroupApplyDto.getVipGroupApplyBaseInfo().getUserId());
-        if(Objects.isNull(sysUser)){
-            return failed("请指定指导老师!");
-        }
-        vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganIdList(sysUser.getOrganId());
-        sysUser = sysUserFeignService.queryUserInfo();
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
+        Integer userId = vipGroupApplyDto.getVipGroupApplyBaseInfo().getUserId();
+        Teacher teacher = teacherDao.get(userId);
+        if(Objects.isNull(teacher)){
+            return failed("请指定指导老师!");
+        }
+        if(StringUtils.isEmpty(sysUser.getOrganId()) || sysUser.getOrganId().contains(",")){
+            vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(teacher.getTeacherOrganId());
+        }else {
+            vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(Integer.parseInt(sysUser.getOrganId()));
+        }
         vipGroupService.createVipGroup(vipGroupApplyDto);
         return succeed();
     }