update

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

@@ -188,7 +188,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     musicGroupSubjectPlan.setApplyStudentNum(e.getRegisterIdList().size());
                 }
             });
-            studentRegistrationDao.batchInsert(studentRegistrationList);
+			if (studentRegistrationList.size() > 0) {
+				studentRegistrationDao.batchInsert(studentRegistrationList);
+			}
             musicGroup.setStatus(MusicGroupStatusEnum.PAY);
             musicGroupDao.update(musicGroup);
             musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "跨团调整", sysUser.getId(),""));
@@ -920,8 +922,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         PageInfo<MusicGroup> musicGroupPageInfo;
         if(roles != null && roles.size() == 1 && roles.contains(SysUserRole.EDUCATIONAL_TEACHER)){
             //只有教务老师权限
-            String musicGroupIds = musicGroupDao.queryEducationalMusicGroupId(sysUser.getId());
-            queryInfo.setMusicGroupId(musicGroupIds);
+            /*String musicGroupIds = musicGroupDao.queryEducationalMusicGroupId(sysUser.getId());
+            queryInfo.setMusicGroupId(musicGroupIds);*/
             musicGroupPageInfo = queryPage(queryInfo);
         }else {
             musicGroupPageInfo = queryPage(queryInfo);

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

@@ -38,12 +38,14 @@ public class EmployeeController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
-            if(StringUtils.isEmpty(queryInfo.getOrganId())){
-                Employee employee = employeeService.get(sysUser.getId());
-                queryInfo.setOrganId(employee.getOrganIdList());
-            }
-        }
+		if (!sysUser.getIsSuperAdmin()) {
+			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+				Employee employee = employeeService.get(sysUser.getId());
+				queryInfo.setOrganId(employee.getOrganIdList());
+			}
+		} else {
+			queryInfo.setOrganId(null);
+		}
         return succeed(employeeService.queryEmployByOrganId(queryInfo));
     }
 

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

@@ -45,6 +45,8 @@ public class StudentApplyRefundsController extends BaseController {
 				Employee employee = employeeDao.get(sysUser.getId());
 				queryInfo.setOrganId(employee.getOrganIdList());
 			}
+		} else {
+			queryInfo.setOrganId(null);
 		}
         return succeed(studentApplyRefundsService.queryPage(queryInfo));
     }

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

@@ -53,7 +53,9 @@ public class StudentPaymentOrderController extends BaseController {
                 Employee employee = employeeDao.get(sysUser.getId());
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
-        }
+        } else {
+			queryInfo.setOrganId(null);
+		}
         if(hiddenMode){
             queryInfo.setPaymentChannel(channel);
         }

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

@@ -46,6 +46,8 @@ public class StudentRechargeController extends BaseController {
 				Employee employee = employeeDao.get(sysUser.getId());
 				queryInfo.setOrganId(employee.getOrganIdList());
 			}
+		} else {
+			queryInfo.setOrganId(null);
 		}
 		return succeed(studentRechargeService.queryPage(queryInfo));
 	}

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

@@ -56,6 +56,8 @@ public class StudentWithdrawController extends BaseController {
 				Employee employee = employeeDao.get(sysUser.getId());
 				queryInfo.setOrganId(employee.getOrganIdList());
 			}
+		} else {
+			queryInfo.setOrganId(null);
 		}
 		return succeed(studentWithdrawService.queryPage(queryInfo));
 	}