Merge remote-tracking branch 'origin/system_fee' into system_fee

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +35,10 @@ public class MemberRankPrivilegesServiceImpl extends BaseServiceImpl<Integer, Me
 	public List<MemberPrivilegesItem> queryByMemberRankId(Integer memberRankId) {
 		List<Integer> memberPrivilegesIdList = memberRankPrivilegesDao.findByRankSettingId(memberRankId).stream().map(e -> e.getMemberPrivilegesId())
 				.collect(Collectors.toList());
+		
+		if (memberPrivilegesIdList == null || memberPrivilegesIdList.size() == 0) {
+			return new ArrayList<MemberPrivilegesItem>();
+		}
 
 		List<MemberPrivilegesItem> memberPrivilegesItemList = memberPrivilegesItemDao.findById(memberPrivilegesIdList);
 

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

@@ -129,6 +129,7 @@ public class StudentManageController extends BaseController {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 		Student student = studentService.get(user.getId());
+		student.setId(user.getId());
 		student.setUsername(user.getUsername());
 		student.setPhone(user.getPhone());
 		student.setCurrentClass(user.getCurrentClass());