省监管

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/order/FgOrderInfoServiceImpl.java

@@ -878,6 +878,7 @@ public class FgOrderInfoServiceImpl extends BaseModelServiceImpl<OrderInfo,Integ
 		}else{
 			//获取当前登录的省监管用户信息
 			supervise = bgMemberClient.selectByOid(redis.getMember().getRelationId());
+			System.out.println(redis.getMember().getRelationId());
 		}
 		if(supervise == null || supervise.getData() == null){
 			throw new BaseException("获取省监管用户信息异常,请联系出版社管理员");

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicBasicRelationServiceImpl.java

@@ -153,7 +153,6 @@ public class FgPublicBasicRelationServiceImpl extends BaseServiceImpl<PublicBasi
 				for (int i = voList.size() - 1; i >= 0; i--) {
 					for(IdAndNameVo idAndNameVo : basicList) {
 						if(voList.get(i).getAcademicLevel().toString().equals(idAndNameVo.getAcademicLevel().toString())) {
-							//System.out.println(idAndNameVo.getSemester());
 							if(!voList.get(i).getSemester().equals(idAndNameVo.getSemester())) {
 								voList.remove(i);
 							}

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicLessonServiceImpl.java

@@ -876,7 +876,7 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
 
 		StringBuffer isbns = new StringBuffer();
 		StringBuffer total = new StringBuffer();
-		importExcelVos.parallelStream().forEach(vo ->{
+		importExcelVos.forEach(vo ->{
 			//获取学校的信息
 			School school = fgPublicLessonMapper.querySchoolInfo(vo.getSchoolName());
 			//获取基础教学计划