Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -145,8 +145,9 @@
     </select>
     <sql id="queryTree">
         <where>
+                sm.parent_id_ IS NOT NULL
             <if test="userId != null">
-                sur.user_id_ = #{userId}
+                AND sur.user_id_ = #{userId}
             </if>
             <if test="hid != null">
                 AND sm.hidden_ = #{hid}
@@ -161,9 +162,9 @@
     </sql>
 
     <select id="findByParentId" resultMap="SysMenu">
-        SELECT sm.* FROM sys_user_role sur
-        LEFT JOIN sys_role_menu srm ON sur.role_id_ = srm.role_id_
-        LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
+        SELECT sm.* FROM sys_menu sm
+        LEFT JOIN sys_role_menu srm ON srm.menu_id_ = sm.id_
+        LEFT JOIN sys_user_role sur ON sur.role_id_ = srm.role_id_
         <include refid="queryTree"/>
         GROUP BY sm.id_
         ORDER BY sm.sort_ DESC,sm.id_ DESC

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

@@ -17,6 +17,26 @@ public class ClassGroupTeachersDto extends ClassGroup {
 	/** 班级老师课酬 */
 	private List<ClassGroupTeacherSalary> classGroupTeacherSalaryList;
 
+	private String teachingTeacherName;
+
+	private String bishopTeacherName;
+
+	public String getTeachingTeacherName() {
+		return teachingTeacherName;
+	}
+
+	public void setTeachingTeacherName(String teachingTeacherName) {
+		this.teachingTeacherName = teachingTeacherName;
+	}
+
+	public String getBishopTeacherName() {
+		return bishopTeacherName;
+	}
+
+	public void setBishopTeacherName(String bishopTeacherName) {
+		this.bishopTeacherName = bishopTeacherName;
+	}
+
 	//合奏班名称
 	private String mixClassName;
 

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

@@ -640,14 +640,14 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public StudentRegistration queryByUserIdAndMusicGroupId(Integer userId, String musicGroupId) {
-//        StudentRegistration registration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
-//        if (registration == null) {
-//            return null;
-//        }
-//        SysUserCashAccount account = sysUserCashAccountDao.getLocked(userId);
-//        registration.setBalance(account.getBalance());
-//        registration.setTransferStudent(registration.getTemporaryCourseFee() == null ? 0 : 1);
-        return studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+        StudentRegistration registration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+        if (registration == null) {
+            return null;
+        }
+        SysUserCashAccount account = sysUserCashAccountDao.getLocked(userId);
+        registration.setBalance(account==null?BigDecimal.ZERO : account.getBalance());
+        registration.setTransferStudent(0);
+        return registration;
     }
 
     @Override

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

@@ -1416,7 +1416,7 @@
                 AND FIND_IN_SET(mg.organ_id_,#{organIdList})
             </if>
             <if test="search != null and search != ''">
-                AND (mg.name_ LIKE CONCAT('%',#{search},'%') OR cg.music_group_id_ LIKE CONCAT('%',#{search},'%'))
+                AND (cg.id_ LIKE CONCAT('%',#{search},'%') OR cg.name_ LIKE CONCAT('%',#{search},'%') OR mg.name_ LIKE CONCAT('%',#{search},'%') OR cg.music_group_id_ LIKE CONCAT('%',#{search},'%'))
             </if>
             <if test="classGroupIds != null and classGroupIds.size()>0">
                 AND cg.id_ IN

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

@@ -590,7 +590,7 @@
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= #{startTime} AND cs.class_date_>='2021-02-20'
+		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>='2021-02-20'
 		AND (ta.sign_in_status_ != 1 OR ta.sign_out_status_ != 1 OR sa.status_ != 'NORMAL') AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
 		<if test="organIds != null and organIds != ''">
@@ -602,7 +602,7 @@
 		SELECT COUNT(DISTINCT cs.id_) FROM course_schedule cs
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= #{startTime}
+		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>='2021-02-20'
 		AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
 		<if test="organIds != null and organIds != ''">

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

@@ -425,7 +425,7 @@
 		<where>
 			mg.status_ = 'PROGRESS'
 			AND DATE_FORMAT( NOW(), '%Y-%m-%d' ) >= DATE_FORMAT( mgpc.payment_valid_start_date_, '%Y-%m-%d' )
-			AND mgpcd.payment_status_ = 'NON_PAYMENT'
+			AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
 			AND mgpcd.expect_amount_ > 0
 			<if test="organIds!=null and organIds.size()>0">
 				AND mg.organ_id_ IN

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

@@ -534,7 +534,7 @@
         AND mgpc.status_ IN ('NO','OPEN','OVER')
         AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= DATE_FORMAT(mgpc.payment_valid_start_date_,'%Y-%m-%d')
         LEFT JOIN music_group_payment_calender_detail mgpcd ON mgpc.id_ = mgpcd.music_group_payment_calender_id_ AND mgpcd.user_id_ = #{userId}
-        WHERE FIND_IN_SET(mg.id_,#{musicGroupId}) AND mgpc.batch_no_ IS NOT NULL
+        WHERE FIND_IN_SET(mg.id_,#{musicGroupId}) AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
         GROUP BY mg.id_
     </select>
     <select id="queryUserCoursePaymentStatus" resultType="java.util.Map">
@@ -545,7 +545,7 @@
         AND mgpc.status_ IN ('NO','OPEN','OVER')
         AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= DATE_FORMAT(mgpc.payment_valid_start_date_,'%Y-%m-%d')
         LEFT JOIN music_group_payment_calender_detail mgpcd ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
-        WHERE mg.id_ = #{musicGroupId} AND mgpcd.expect_amount_ > 0 AND mgpc.batch_no_ IS NOT NULL AND mgpcd.user_id_ IN
+        WHERE mg.id_ = #{musicGroupId} AND mgpcd.expect_amount_ > 0 AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT' AND mgpcd.user_id_ IN
         <foreach collection="studentId" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>

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

@@ -186,14 +186,12 @@ public class TeacherController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         String organIds = new String();
-        if (!sysUser.getIsSuperAdmin()) {
-            Teacher teacher = teacherService.get(sysUser.getId());
-            if (StringUtils.isEmpty(organIds)) {
-                organIds = teacher.getTeacherOrganId() + "";
-            }
-            if(StringUtils.isNotBlank(teacher.getFlowOrganRange())){
-                organIds = organIds + "," + teacher.getFlowOrganRange();
-            }
+        Teacher teacher = teacherService.get(sysUser.getId());
+        if (StringUtils.isEmpty(organIds)) {
+            organIds = teacher.getTeacherOrganId() + "";
+        }
+        if(StringUtils.isNotBlank(teacher.getFlowOrganRange())){
+            organIds = organIds + "," + teacher.getFlowOrganRange();
         }
         return succeed(employeeService.findByRole("4,5",organIds));
     }

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

@@ -296,17 +296,15 @@ public class ClassGroupController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
-                queryInfo.setOrganIdList(employee.getOrganIdList());
-            }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
-                return failed("用户所在分部异常");
-            }else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
-                    return failed("非法请求");
-                }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
+            queryInfo.setOrganIdList(employee.getOrganIdList());
+        }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
+            return failed("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
+                return failed("非法请求");
             }
         }
         return succeed(classGroupService.queryClassGroupPage(queryInfo));

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

@@ -65,19 +65,17 @@ public class CooperationOrganController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(!sysUser.getIsSuperAdmin()){
-			Employee employee = employeeDao.get(sysUser.getId());
-			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-				queryInfo.setOrganId(employee.getOrganIdList());
-			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
-				return failed("用户所在分部异常");
-			}else {
-				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
-					return failed("非法请求");
-				}
-			}
-		}
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            return failed("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                return failed("非法请求");
+            }
+        }
         return succeed(cooperationOrganService.queryPage(queryInfo));
     }
 

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

@@ -52,17 +52,15 @@ public class CourseReviewController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-                queryInfo.setOrganId(employee.getOrganIdList());
-            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
-                return failed("用户所在分部异常");
-            } else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
-                    return failed("非法请求");
-                }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+            return failed("用户所在分部异常");
+        } else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                return failed("非法请求");
             }
         }
         return succeed(courseReviewService.findPracticeGroupReviews(queryInfo));
@@ -90,17 +88,15 @@ public class CourseReviewController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-                queryInfo.setOrganId(employee.getOrganIdList());
-            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
-                return failed("用户所在分部异常");
-            } else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
-                    return failed("非法请求");
-                }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+            return failed("用户所在分部异常");
+        } else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                return failed("非法请求");
             }
         }
         return succeed(courseReviewService.getVipCourseReviews(queryInfo));

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

@@ -82,17 +82,15 @@ public class CourseScheduleController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
-                queryInfo.setOrganIdList(employee.getOrganIdList());
-            }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
-                return failed("用户所在分部异常");
-            }else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
-                    return failed("非法请求");
-                }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
+            queryInfo.setOrganIdList(employee.getOrganIdList());
+        }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
+            return failed("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
+                return failed("非法请求");
             }
         }
         return succeed(courseScheduleService.endFindCourseSchedules(queryInfo));

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

@@ -55,7 +55,6 @@ public class CourseScheduleTeacherSalaryController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -67,7 +66,6 @@ public class CourseScheduleTeacherSalaryController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
 
         Map<String, Object> result=new HashMap<>();
         result.put("pageInfo", courseScheduleTeacherSalaryService.findIsSettlementCourseSalarys(queryInfo));

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

@@ -42,7 +42,6 @@ public class DegreeController extends BaseController { ;
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -54,7 +53,6 @@ public class DegreeController extends BaseController { ;
                     return failed("非法请求");
                 }
             }
-        }
         queryInfo.setSort("create_time_");
         queryInfo.setOrder("DESC");
         return succeed(degreeRegistrationService.getPageList(queryInfo));

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

@@ -53,7 +53,6 @@ public class EmployeeController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-		if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeService.get(sysUser.getId());
 			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
 				queryInfo.setOrganId(employee.getOrganIdList());
@@ -65,7 +64,6 @@ public class EmployeeController extends BaseController {
                     return failed("非法请求");
                 }
             }
-		}
         return succeed(employeeService.queryEmployByOrganId(queryInfo));
     }
 
@@ -159,11 +157,9 @@ public class EmployeeController extends BaseController {
         }
         String organIds = new String();
         if(Objects.isNull(organId)){
-            if (!sysUser.getIsSuperAdmin()) {
-                Employee employee = employeeService.get(sysUser.getId());
-                if (StringUtils.isEmpty(organIds)) {
-                    organIds = employee.getOrganIdList();
-                }
+            Employee employee = employeeService.get(sysUser.getId());
+            if (StringUtils.isEmpty(organIds)) {
+                organIds = employee.getOrganIdList();
             }
         }else{
             organIds = organId.toString();
@@ -184,11 +180,9 @@ public class EmployeeController extends BaseController {
             sysUser = sysUserFeignService.queryUserById(userId);
         }
         String organIds = new String();
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeService.get(sysUser.getId());
-            if (StringUtils.isEmpty(organIds)) {
-                organIds = employee.getOrganIdList();
-            }
+        Employee employee = employeeService.get(sysUser.getId());
+        if (StringUtils.isEmpty(organIds)) {
+            organIds = employee.getOrganIdList();
         }
         return succeed(employeeService.findByRole("4",organIds));
     }
@@ -202,11 +196,9 @@ public class EmployeeController extends BaseController {
             return failed("用户信息获取失败");
         }
         if(StringUtils.isEmpty(organIds)){
-            if (!sysUser.getIsSuperAdmin()) {
-                Employee employee = employeeService.get(sysUser.getId());
-                if (StringUtils.isEmpty(organIds)) {
-                    organIds=employee.getOrganIdList();
-                }
+            Employee employee = employeeService.get(sysUser.getId());
+            if (StringUtils.isEmpty(organIds)) {
+                organIds=employee.getOrganIdList();
             }
         }
         return succeed(employeeService.findByRole("37",organIds));
@@ -240,11 +232,9 @@ public class EmployeeController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeService.get(sysUser.getId());
-            if (StringUtils.isEmpty(organIds)) {
-                organIds=employee.getOrganIdList();
-            }
+        Employee employee = employeeService.get(sysUser.getId());
+        if (StringUtils.isEmpty(organIds)) {
+            organIds=employee.getOrganIdList();
         }
         return succeed(employeeService.findAllByRole("37",organIds));
     }

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
 import io.swagger.annotations.Api;
@@ -38,17 +39,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.enums.AccountType;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
-import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
-import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
-import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
-import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
-import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
@@ -137,6 +127,70 @@ public class ExportController extends BaseController {
     private VipGroupActivityService vipGroupActivityService;
     @Autowired
     private GoodsService goodsService;
+    @Autowired
+    private ClassGroupService classGroupService;
+
+    @ApiOperation(value = "班级列表导出")
+    @PostMapping("export/classGroup")
+    @PreAuthorize("@pcs.hasPermissions('export/classGroup')")
+    public void exportClassGroup(HttpServletResponse response, ClassGroupQueryInfo queryInfo) throws IOException {
+        queryInfo.setPage(1);
+        queryInfo.setRows(49999);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
+            queryInfo.setOrganIdList(employee.getOrganIdList());
+        }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
+            throw new BizException("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
+                throw new BizException("非法请求");
+            }
+        }
+        List<ClassGroupTeachersDto> rows = classGroupService.queryClassGroupPage(queryInfo).getRows();
+        for (ClassGroupTeachersDto row : rows) {
+            List<ClassGroupTeacherMapper> classGroupTeacherMapperList = row.getClassGroupTeacherMapperList();
+            if(classGroupTeacherMapperList.size() > 0){
+                List<ClassGroupTeacherMapper> teachingTeachers = classGroupTeacherMapperList.stream().filter(e -> e.getTeacherRole() == TeachTypeEnum.TEACHING).collect(Collectors.toList());
+                if(teachingTeachers.size() > 0){
+                    row.setTeachingTeacherName(StringUtils.join(teachingTeachers.stream().map(e->e.getUserName()).collect(Collectors.toList()), ","));
+                }
+                List<ClassGroupTeacherMapper> bishopTeachers = classGroupTeacherMapperList.stream().filter(e -> e.getTeacherRole() == TeachTypeEnum.BISHOP).collect(Collectors.toList());
+                if(bishopTeachers.size() > 0){
+                    row.setBishopTeacherName(StringUtils.join(bishopTeachers.stream().map(e->e.getUserName()).collect(Collectors.toList()),","));
+                }
+            }
+        }
+        OutputStream outputStream = response.getOutputStream();
+        try {
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"课程组编号", "课程组名称", "分部名称", "班级名称",
+                    "班级类型", "班级人数", "主教老师", "助教老师", "已上课时", "总课数"}, new String[]{
+                    "musicGroupId", "musicGroupName", "organName", "name",
+                    "type.msg", "studentNum == NUll?0:studentNum", "bishopTeacherName", "teachingTeacherName", "currentClassTimes",
+                    "totalClassTimes"}, rows);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attac:wq" +
+                    "hment;filename=classGroup-" + DateUtil.getDate(new Date()) + ".xls");
+            response.flushBuffer();
+            outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 
     @ApiOperation(value = "商品列表导出")
     @PostMapping("export/goods")
@@ -185,17 +239,15 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-                queryInfo.setOrganId(employee.getOrganIdList());
-            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
-                throw new BizException("用户所在分部异常");
-            } else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
-                    throw new BizException("非法请求");
-                }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+            throw new BizException("用户所在分部异常");
+        } else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                throw new BizException("非法请求");
             }
         }
         List<ExportVipGroupActivityDto> rows = vipGroupActivityService.exportVipGroupActivity(queryInfo);
@@ -236,7 +288,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -248,7 +299,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List<ExportStudentAttendanceDto> rows = studentAttendanceService.exportStudentAttendancesQueryPage(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -317,7 +367,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -329,7 +378,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
         List<MusicGroupPaymentCalenderAuditDto> rows = musicGroupPaymentCalenderService.auditList(queryInfo).getRows();
@@ -368,7 +416,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -380,7 +427,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List rows = teacherAttendanceService.queryTeacherAttendances(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -450,7 +496,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -462,7 +507,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List<StudentBuyPracticeDto> rows = practiceGroupService.studentBuys(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -577,7 +621,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -589,7 +632,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         Date endTime = queryInfo.getEndTime();
         if (endTime != null) {
             queryInfo.setEndTime(DateUtil.addDays(endTime, 1));
@@ -630,7 +672,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -642,7 +683,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         queryInfo.setIsExport(true);
         List<StudentManageListDto> rows = studentManageService.findStudentsByOrganId(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
@@ -684,7 +724,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -696,7 +735,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List<PracticeGroupDto> rows = practiceGroupService.findPracticeGroups(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
         if (rows != null && rows.size() > 0) {
@@ -749,7 +787,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -761,7 +798,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List<VipGroup> rows = vipGroupService.findVipGroups(queryInfo).getRows();
         OutputStream outputStream = response.getOutputStream();
         if (rows != null && rows.size() > 0) {
@@ -805,7 +841,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -817,7 +852,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List<CourseScheduleEndDto> rows = scheduleService.endFindCourseSchedules(queryInfo).getRows();
         for (CourseScheduleEndDto row : rows) {
             row.setIsComplaints(StringUtils.equals(row.getIsComplaints(), "1") ? "有" : "无");
@@ -859,7 +893,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -871,7 +904,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List<SporadicChargeInfo> rows = sporadicChargeInfoService.queryDetailPage(queryInfo).getRows();
         for (SporadicChargeInfo row : rows) {
             row.setOpenFlagStr(row.getOpenFlag().equals(0) ? "开启" : "关闭");
@@ -1033,14 +1065,12 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/orderList')")
     public void orderList(StudentPaymentOrderQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && "3".equals(queryInfo.getOrderType())) {
                 queryInfo.setRoutingOrganId(employee.getOrganIdList());
             } else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
-        }
         if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
@@ -1320,10 +1350,8 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/courseReviews')")
     public void courseReviews(CourseReviewQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeDao.get(sysUser.getId());
-            queryInfo.setOrganId(employee.getOrganIdList());
-        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        queryInfo.setOrganId(employee.getOrganIdList());
         queryInfo.setIsExport(1);
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
@@ -1409,10 +1437,8 @@ public class ExportController extends BaseController {
     public void practiceGroup(HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         String organIds = null;
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeDao.get(sysUser.getId());
-            organIds = employee.getOrganIdList();
-        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        organIds = employee.getOrganIdList();
 
         List<CourseGroupExportDto> practiceGroupExports = practiceGroupDao.getPracticeGroupExport(organIds);
         if (practiceGroupExports == null || practiceGroupExports.size() == 0) {
@@ -1481,10 +1507,8 @@ public class ExportController extends BaseController {
     public void vipGroup(HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         String organIds = null;
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeDao.get(sysUser.getId());
-            organIds = employee.getOrganIdList();
-        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        organIds = employee.getOrganIdList();
 
         List<CourseGroupExportDto> vipGroupExports = courseScheduleDao.getVipGroupExport(organIds);
         if (vipGroupExports == null || vipGroupExports.size() == 0) {
@@ -1567,7 +1591,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -1579,7 +1602,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List<ExtraExerciseStudentsDto> rows = extracurricularExercisesReplyService.findExtraExercises(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
             response.setStatus(500);
@@ -1628,7 +1650,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -1640,7 +1661,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List<StudentExercisesSituationDto> rows = studentExtracurricularExercisesSituationService.findStudentExtracurricularExercisesSituations(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
             response.setStatus(500);
@@ -1683,7 +1703,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -1695,7 +1714,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         List<TeacherCourseSalaryDetail4WebDto> rows = courseScheduleTeacherSalaryService.findIsSettlementCourseSalarys(queryInfo).getRows();
         if (CollectionUtils.isEmpty(rows)) {
             response.setStatus(500);
@@ -1768,7 +1786,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -1780,7 +1797,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         PageInfo<Student4operating> PageOperatingStudents = studentManageService.getOperatingStudents(queryInfo);
 
         if (PageOperatingStudents.getTotal() <= 0) {
@@ -1843,10 +1859,8 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/vipCourseReviews')")
     public void vipCourseReviews(CourseReviewQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             queryInfo.setOrganId(employee.getOrganIdList());
-        }
         queryInfo.setIsExport(1);
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
@@ -1987,7 +2001,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new IOException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -1999,7 +2012,6 @@ public class ExportController extends BaseController {
                     throw new IOException("非法请求");
                 }
             }
-        }
         queryInfo.setRows(65000);
         PageInfo<CooperationOrgan> pageList = cooperationOrganService.queryPage(queryInfo);
         if (pageList.getTotal() <= 0) {
@@ -2039,12 +2051,10 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/musicGroupRegister')")
     public void musicGroupRegister(String organIds, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isBlank(organIds)) {
                 organIds = employee.getOrganIdList();
             }
-        }
         List<MusicGroupStatusEnum> musicGroupStatusList = new ArrayList<>();
         musicGroupStatusList.add(MusicGroupStatusEnum.APPLY);
         musicGroupStatusList.add(MusicGroupStatusEnum.PAY);
@@ -2166,14 +2176,12 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/routeOrderList')")
     public void routeOrderList(StudentPaymentOrderQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && queryInfo.getOrderType().equals("3")) {
                 queryInfo.setRoutingOrganId(employee.getOrganIdList());
             } else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
-        }
         if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
@@ -2446,12 +2454,10 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/musicGroupNormalStudentNum')")
     public void musicGroupNormalStudentNum(String organIds, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isBlank(organIds)) {
                 organIds = employee.getOrganIdList();
             }
-        }
 
         List<MusicGroupStatusEnum> musicGroupStatusList = new ArrayList<>();
         musicGroupStatusList.add(MusicGroupStatusEnum.PAY);
@@ -2542,12 +2548,10 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/studentOrder')")
     public void studentOrder(String organIds, Date date, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isBlank(organIds)) {
                 organIds = employee.getOrganIdList();
             }
-        }
         Date startTime = DateUtil.getFirstDayOfMonth(date);
         Date EndTime = DateUtil.getLastSecondWithDay(DateUtil.getLastDayOfMonth(date));
 
@@ -2640,7 +2644,6 @@ public class ExportController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -2652,7 +2655,6 @@ public class ExportController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         if (queryInfo.getEndTime() != null) {
             queryInfo.setEndTime(DateUtil.getLastTimeWithDay(queryInfo.getEndTime()));
         }

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

@@ -42,7 +42,6 @@ public class ExtracurricularExercisesController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -54,7 +53,6 @@ public class ExtracurricularExercisesController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         return succeed(extracurricularExercisesService.queryPage(queryInfo));
     }
 

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

@@ -39,7 +39,6 @@ public class ExtracurricularExercisesReplyController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -51,7 +50,6 @@ public class ExtracurricularExercisesReplyController extends BaseController {
                     throw new BizException("非法请求");
                 }
             }
-        }
         return succeed(extracurricularExercisesReplyService.findExtraExercises(queryInfo));
     }
 

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

@@ -48,7 +48,6 @@ public class FinancialExpenditureController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -60,7 +59,6 @@ public class FinancialExpenditureController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(financialExpenditureService.queryFinancialExpenditurePage(queryInfo));
     }
 

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

@@ -123,7 +123,6 @@ public class IndexController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
 			if (StringUtils.isBlank(indexDataQueryInfo.getOrganId())) {
 				indexDataQueryInfo.setOrganId(employee.getOrganIdList());
@@ -135,7 +134,6 @@ public class IndexController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
 		return succeed(indexService.getIndexBaseData(indexDataQueryInfo));
 	}
 
@@ -145,7 +143,6 @@ public class IndexController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
 			if (StringUtils.isBlank(organId)) {
 				organId = employee.getOrganIdList();
@@ -157,7 +154,6 @@ public class IndexController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
 		return succeed(indexService.hasIndexErrData(organId));
 	}
 
@@ -167,7 +163,6 @@ public class IndexController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
 			if (StringUtils.isBlank(organId)) {
 				organId = employee.getOrganIdList();
@@ -179,7 +174,6 @@ public class IndexController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
 		return succeed(indexService.getIndexErrData(organId, errorType));
 	}
 
@@ -189,7 +183,6 @@ public class IndexController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
 			if (StringUtils.isBlank(organId)) {
 				organId = employee.getOrganIdList();
@@ -201,7 +194,6 @@ public class IndexController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
 		return succeed(indexService.getRemindMatterData(organId));
 	}
 }

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

@@ -72,7 +72,6 @@ public class InspectionController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -84,7 +83,6 @@ public class InspectionController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(inspectionService.getPageList(queryInfo));
     }
 

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

@@ -56,17 +56,15 @@ public class InspectionItemController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-                queryInfo.setOrganId(employee.getOrganIdList());
-            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
-                return failed("用户所在分部异常");
-            } else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
-                    return failed("非法请求");
-                }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+            return failed("用户所在分部异常");
+        } else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                return failed("非法请求");
             }
         }
         List<Integer> userRole = employeeDao.queryUserRole(sysUser.getId());

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

@@ -72,7 +72,6 @@ public class InspectionItemPlanController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -84,7 +83,6 @@ public class InspectionItemPlanController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         if (queryInfo.getStartTime() != null) {
             queryInfo.setStartTime(DateUtil.trunc(queryInfo.getStartTime()));
         }

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

@@ -112,7 +112,6 @@ public class MusicGroupController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(!sysUser.getIsSuperAdmin()){
 			Employee employee = employeeDao.get(sysUser.getId());
 			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
 				queryInfo.setOrganId(employee.getOrganIdList());
@@ -124,7 +123,6 @@ public class MusicGroupController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
 		return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
 	}
 

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

@@ -119,7 +119,6 @@ public class MusicGroupPaymentCalenderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -131,7 +130,6 @@ public class MusicGroupPaymentCalenderController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(musicGroupPaymentCalenderService.auditList(queryInfo));
     }
 

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

@@ -114,7 +114,6 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeService.get(sysUser.getId());
             if (StringUtils.isBlank(queryInfo.getOrganIds())) {
                 queryInfo.setOrganIds(employee.getOrganIdList());
@@ -126,7 +125,6 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(musicGroupPaymentCalenderDetailService.queryArrearageStudents(queryInfo));
     }
 
@@ -138,7 +136,6 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeService.get(sysUser.getId());
             if (StringUtils.isBlank(organIds)) {
                 organIds = employee.getOrganIdList();
@@ -150,7 +147,6 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(musicGroupPaymentCalenderDetailService.getNoPaymentStudentMusicGroups(organIds));
     }
 }

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

@@ -55,7 +55,6 @@ public class MusicGroupQuitController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
 			if (StringUtils.isBlank(queryInfo.getOrganId())) {
 				queryInfo.setOrganId(employee.getOrganIdList());
@@ -67,7 +66,6 @@ public class MusicGroupQuitController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
 		return succeed(musicGroupQuitService.queryPage(queryInfo));
 	}
 

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

@@ -49,7 +49,6 @@ public class OperatingReportController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -61,7 +60,6 @@ public class OperatingReportController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         if (queryInfo.getMonth() != null) {
             queryInfo.setStartTime(DateUtil.getFirstDayOfMonth(queryInfo.getMonth()));
             queryInfo.setEndTime(DateUtil.getLastDayOfMonth(queryInfo.getMonth()));
@@ -78,7 +76,6 @@ public class OperatingReportController extends BaseController {
         if (sysUser == null) {
             throw new IOException("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -90,7 +87,6 @@ public class OperatingReportController extends BaseController {
                     throw new IOException("非法请求");
                 }
             }
-        }
         if (queryInfo.getMonth() != null) {
             queryInfo.setStartTime(DateUtil.getFirstDayOfMonth(queryInfo.getMonth()));
             queryInfo.setEndTime(DateUtil.getLastDayOfMonth(queryInfo.getMonth()));

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

@@ -54,7 +54,6 @@ public class PracticeGroupManageController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -66,7 +65,6 @@ public class PracticeGroupManageController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(practiceGroupService.findPracticeGroups(queryInfo));
     }
 
@@ -108,7 +106,6 @@ public class PracticeGroupManageController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -120,7 +117,6 @@ public class PracticeGroupManageController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(practiceGroupService.findPracticeGroupReviews(queryInfo));
     }
 

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

@@ -79,7 +79,6 @@ public class SchoolController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(!sysUser.getIsSuperAdmin()){
 			Employee employee = employeeDao.get(sysUser.getId());
 			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
 				queryInfo.setOrganId(employee.getOrganIdList());
@@ -91,7 +90,6 @@ public class SchoolController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
         return succeed(schoolService.queryPageDetail(queryInfo));
     }
 
@@ -103,7 +101,6 @@ public class SchoolController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(organId)) {
                 organId = employee.getOrganIdList();
@@ -115,7 +112,6 @@ public class SchoolController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(schoolService.queryByOrganId(organId));
     }
 

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

@@ -55,7 +55,6 @@ public class SellOrderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -67,7 +66,6 @@ public class SellOrderController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         if (queryInfo.getEndTime() != null) {
             queryInfo.setEndTime(DateUtil.getLastTimeWithDay(queryInfo.getEndTime()));
         }

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

@@ -43,7 +43,6 @@ public class SporadicChargeInfoController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(!sysUser.getIsSuperAdmin()){
 			Employee employee = employeeDao.get(sysUser.getId());
 			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
 				queryInfo.setOrganId(employee.getOrganIdList());
@@ -55,7 +54,6 @@ public class SporadicChargeInfoController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
 		queryInfo.setSort("id_");
 		return succeed(sporadicChargeInfoService.queryDetailPage(queryInfo));
 	}

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

@@ -43,7 +43,6 @@ public class StudentApplyRefundsController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(!sysUser.getIsSuperAdmin()){
 			Employee employee = employeeDao.get(sysUser.getId());
 			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
 				queryInfo.setOrganId(employee.getOrganIdList());
@@ -55,7 +54,6 @@ public class StudentApplyRefundsController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
         return succeed(studentApplyRefundsService.queryPage(queryInfo));
     }
 }

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

@@ -63,17 +63,15 @@ public class StudentExtracurricularExercisesSituationController extends BaseCont
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
-                queryInfo.setOrganIdList(employee.getOrganIdList());
-            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
-                return failed("用户所在分部异常");
-            }else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
-                    return failed("非法请求");
-                }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
+            queryInfo.setOrganIdList(employee.getOrganIdList());
+        }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            return failed("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
+                return failed("非法请求");
             }
         }
         return succeed(studentExtracurricularExercisesSituationService.findStudentExtracurricularExercisesSituations(queryInfo));

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

@@ -72,7 +72,6 @@ public class StudentManageController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -84,7 +83,6 @@ public class StudentManageController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         queryInfo.setIsExport(false);
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }
@@ -320,7 +318,6 @@ public class StudentManageController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -332,7 +329,6 @@ public class StudentManageController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(studentManageService.getOperatingStudents(queryInfo));
     }
 

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

@@ -60,7 +60,6 @@ public class StudentPaymentOrderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -72,7 +71,6 @@ public class StudentPaymentOrderController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
@@ -106,7 +104,6 @@ public class StudentPaymentOrderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -118,7 +115,6 @@ public class StudentPaymentOrderController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(studentPaymentOrderService.sporadicQueryPage(queryInfo));
     }
 
@@ -130,7 +126,6 @@ public class StudentPaymentOrderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -142,7 +137,6 @@ public class StudentPaymentOrderController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         queryInfo.setOrderType("1");
 
         PageInfo<StudentPaymentOrderDto> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
@@ -166,7 +160,6 @@ public class StudentPaymentOrderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -178,7 +171,6 @@ public class StudentPaymentOrderController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         queryInfo.setOrderType("2");
 
         PageInfo<StudentPaymentOrderDto> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
@@ -218,7 +210,6 @@ public class StudentPaymentOrderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getRoutingOrganId())) {
                 queryInfo.setRoutingOrganId(employee.getOrganIdList());
@@ -230,7 +221,6 @@ public class StudentPaymentOrderController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
 
         PageInfo<StudentPaymentOrderDto> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
         return succeed(studentPaymentOrderPageInfo);

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

@@ -65,7 +65,6 @@ public class StudentPaymentRouteOrderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getRoutingOrganId())) {
                 queryInfo.setRoutingOrganId(employee.getOrganIdList());
@@ -77,7 +76,6 @@ public class StudentPaymentRouteOrderController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
             List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
@@ -99,7 +97,6 @@ public class StudentPaymentRouteOrderController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -111,7 +108,6 @@ public class StudentPaymentRouteOrderController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
 
         return succeed(studentPaymentRouteOrderService.queryAuditList(queryInfo));
     }

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

@@ -44,7 +44,6 @@ public class StudentRechargeController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(!sysUser.getIsSuperAdmin()){
 			Employee employee = employeeDao.get(sysUser.getId());
 			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
 				queryInfo.setOrganId(employee.getOrganIdList());
@@ -56,7 +55,6 @@ public class StudentRechargeController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
 		return succeed(studentRechargeService.queryPage(queryInfo));
 	}
 

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

@@ -46,7 +46,6 @@ public class StudentRepairController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -58,7 +57,6 @@ public class StudentRepairController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         Date endTime = queryInfo.getEndTime();
         if(endTime != null){
             queryInfo.setEndTime(DateUtil.addDays(endTime, 1));

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

@@ -54,7 +54,6 @@ public class StudentWithdrawController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(!sysUser.getIsSuperAdmin()){
 			Employee employee = employeeDao.get(sysUser.getId());
 			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
 				queryInfo.setOrganId(employee.getOrganIdList());
@@ -66,7 +65,6 @@ public class StudentWithdrawController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
 		return succeed(studentWithdrawService.queryPage(queryInfo));
 	}
 }

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

@@ -56,7 +56,6 @@ public class SubjectChangeController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
                 queryInfo.setOrganIdList(employee.getOrganIdList());
@@ -68,7 +67,6 @@ public class SubjectChangeController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         if (queryInfo.getEndTime() != null) {
             queryInfo.setEndTime(DateUtil.getLastTimeWithDay(queryInfo.getEndTime()));
         }

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

@@ -51,7 +51,6 @@ public class TeacherAttendanceController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -63,7 +62,6 @@ public class TeacherAttendanceController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(teacherAttendanceService.queryTeacherAttendances(queryInfo));
     }
 
@@ -107,7 +105,6 @@ public class TeacherAttendanceController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -119,7 +116,6 @@ public class TeacherAttendanceController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(teacherAttendanceService.queryTeacherAttendanceComplaints(queryInfo));
     }
 

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

@@ -55,7 +55,6 @@ public class TeacherController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -67,7 +66,6 @@ public class TeacherController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(teacherService.queryPageDetail(queryInfo));
     }
 
@@ -97,7 +95,6 @@ public class TeacherController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(organId)) {
                 organId = employee.getOrganIdList();
@@ -109,7 +106,6 @@ public class TeacherController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(teacherService.findTeachers(organId));
     }
 
@@ -128,7 +124,6 @@ public class TeacherController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(organId)) {
                 organId = employee.getOrganIdList();
@@ -140,7 +135,6 @@ public class TeacherController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(teacherService.findTeacherByOrganId(organId,subjectIds,jobNature));
     }
 
@@ -152,7 +146,6 @@ public class TeacherController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -164,7 +157,6 @@ public class TeacherController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(teacherService.queryPageName(queryInfo));
     }
 

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

@@ -44,7 +44,6 @@ public class TeacherCourseRewardController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -56,7 +55,6 @@ public class TeacherCourseRewardController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         Date endTime = queryInfo.getEndTime();
         if(endTime != null){
             queryInfo.setEndTime(DateUtil.addDays(endTime, 1));

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

@@ -41,7 +41,6 @@ public class TeacherCourseStatisticsController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -53,7 +52,6 @@ public class TeacherCourseStatisticsController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(teacherCourseStatisticsService.queryPageDetail(queryInfo));
     }
 }

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

@@ -39,7 +39,6 @@ public class TeacherSalaryComplaintsController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -51,7 +50,6 @@ public class TeacherSalaryComplaintsController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(teacherSalaryComplaintsService.queryPage(queryInfo));
     }
 

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

@@ -55,7 +55,6 @@ public class VipGroupActivityController extends BaseController {
         if(sysUser == null){
             return failed("用户信息获取失败");
         }
-		if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -67,7 +66,6 @@ public class VipGroupActivityController extends BaseController {
                     return failed("非法请求");
                 }
             }
-		}
         return succeed(vipGroupActivityService.queryPage(queryInfo));
     }
 

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

@@ -146,7 +146,6 @@ public class VipGroupManageController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -158,7 +157,6 @@ public class VipGroupManageController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(vipGroupService.findVipGroups(queryInfo));
     }
 

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

@@ -45,7 +45,6 @@ public class VisitController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -57,7 +56,6 @@ public class VisitController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(studentVisitService.getPageList(queryInfo));
     }
 

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

@@ -51,7 +51,6 @@ public class WebCourseHomeworkController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -63,7 +62,6 @@ public class WebCourseHomeworkController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(courseHomeworkService.queryHomePage(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPracticeGroupController.java

@@ -216,13 +216,11 @@ public class EduPracticeGroupController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(employee.getOrganIdList())){
                 return failed("用户所在分部异常");
             }
             queryInfo.setOrganIdList(Arrays.asList(employee.getOrganIdList().split(",")));
-        }
         return succeed(studentService.findStudentVipGroupList(queryInfo));
     }
 
@@ -263,13 +261,11 @@ public class EduPracticeGroupController extends BaseController {
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(employee.getOrganIdList())){
                 return failed("用户所在分部异常");
             }
             queryInfo.setOrganIdList(Arrays.asList(employee.getOrganIdList().split(",")));
-        }
         return succeed(practiceGroupService.findConvertDefeatStudents(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/student/StudentAttendanceController.java

@@ -71,7 +71,6 @@ public class StudentAttendanceController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
@@ -83,7 +82,6 @@ public class StudentAttendanceController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(studentAttendanceService.findStudentAttendance(queryInfo));
     }