Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -96,9 +96,11 @@ public class MusicGroupController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(StringUtils.isEmpty(queryInfo.getOrganId())){
-			Employee employee = employeeDao.get(sysUser.getId());
-			queryInfo.setOrganId(employee.getOrganIdList());
+		if(!sysUser.getIsSuperAdmin()){
+			if(StringUtils.isEmpty(queryInfo.getOrganId())){
+				Employee employee = employeeDao.get(sysUser.getId());
+				queryInfo.setOrganId(employee.getOrganIdList());
+			}
 		}
 		return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
 	}

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

@@ -36,9 +36,11 @@ public class StudentManageController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(StringUtils.isEmpty(queryInfo.getOrganId())){
-            Employee employee = employeeDao.get(sysUser.getId());
-            queryInfo.setOrganId(employee.getOrganIdList());
+        if(!sysUser.getIsSuperAdmin()){
+            if(StringUtils.isEmpty(queryInfo.getOrganId())){
+                Employee employee = employeeDao.get(sysUser.getId());
+                queryInfo.setOrganId(employee.getOrganIdList());
+            }
         }
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }

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

@@ -41,9 +41,11 @@ public class StudentPaymentOrderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(StringUtils.isEmpty(queryInfo.getOrganId())){
-            Employee employee = employeeDao.get(sysUser.getId());
-            queryInfo.setOrganId(employee.getOrganIdList());
+        if(!sysUser.getIsSuperAdmin()){
+            if(StringUtils.isEmpty(queryInfo.getOrganId())){
+                Employee employee = employeeDao.get(sysUser.getId());
+                queryInfo.setOrganId(employee.getOrganIdList());
+            }
         }
         return succeed(studentPaymentOrderService.queryPage(queryInfo));
     }

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

@@ -49,9 +49,11 @@ public class TeacherController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(StringUtils.isEmpty(queryInfo.getOrganId())){
-            Employee employee = employeeDao.get(sysUser.getId());
-            queryInfo.setOrganId(employee.getOrganIdList());
+        if(!sysUser.getIsSuperAdmin()){
+            if(StringUtils.isEmpty(queryInfo.getOrganId())){
+                Employee employee = employeeDao.get(sysUser.getId());
+                queryInfo.setOrganId(employee.getOrganIdList());
+            }
         }
         return succeed(teacherService.queryPageDetail(queryInfo));
     }

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

@@ -87,9 +87,11 @@ public class VipGroupManageController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(StringUtils.isEmpty(queryInfo.getOrganId())){
-            Employee employee = employeeDao.get(sysUser.getId());
-            queryInfo.setOrganId(employee.getOrganIdList());
+        if(!sysUser.getIsSuperAdmin()){
+            if(StringUtils.isEmpty(queryInfo.getOrganId())){
+                Employee employee = employeeDao.get(sysUser.getId());
+                queryInfo.setOrganId(employee.getOrganIdList());
+            }
         }
         return succeed(vipGroupService.findVipGroups(queryInfo));
     }