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

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -33,8 +33,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 		return sysMenuDao.getMenusByRoleId(roleId);
 	}
 
-	@Override
-	public List<SysMenu> findByUser(MenuQueryInfo menuQueryInfo) {
+	public List<SysMenu> findByUser1(MenuQueryInfo menuQueryInfo) {
 		SysUser sysUser = sysUserDao.get(menuQueryInfo.getUserId());
 		List<SysMenu> sysMenus = null;
 		if(sysUser.getIsSuperAdmin()){
@@ -49,6 +48,36 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 		return sysMenus;
 	}
 
+	public List<SysMenu> findByUser(MenuQueryInfo menuQueryInfo) {
+		SysUser sysUser = sysUserDao.get(menuQueryInfo.getUserId());
+		if(sysUser.getIsSuperAdmin()){
+			menuQueryInfo.setUserId(null);
+		}
+		List<SysMenu> sysMenus = sysMenuDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId(),menuQueryInfo.getHid());
+		List<SysMenu> sysMenusAllList = sysMenuDao.findByParentId(null,menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId(),menuQueryInfo.getHid());
+
+		for (SysMenu menu:sysMenus) {
+			menu = getTree1(menu,sysMenusAllList);
+		}
+		return sysMenus;
+	}
+
+	private SysMenu getTree1(SysMenu menu,List<SysMenu> sysMenusAllList){
+		//得到根节点对象
+		//获取子节点list
+		List<SysMenu> sysMenus = sysMenusAllList.stream().filter(e->e.getParentId().equals(menu.getId())).collect(Collectors.toList());
+		//如果存在子节点
+		if(sysMenus != null && sysMenus.size() > 0) {
+			//将子节点list放入父节点对象
+			menu.setSysMenus(sysMenus);
+			//遍历子节点....
+			for (SysMenu sysMenu : sysMenus) {
+				getTree1(sysMenu,sysMenusAllList);
+			}
+		}
+		return menu;
+	}
+
 	private SysMenu getTree(SysMenu menu, String delFlag,Integer userId,Integer hid){
 		//得到根节点对象
 		//获取子节点list

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/dao/StudentRegistrationDao.java

@@ -269,8 +269,10 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @return
      */
     int updateUser(@Param("id") Integer id,
+                   @Param("name") String name,
                    @Param("realName") String realName,
                    @Param("idCardNo") String idCardNo,
+                   @Param("gender") Integer gender,
                    @Param("certificateType") String certificateType);
 
     /**

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

@@ -67,6 +67,17 @@ public class ClassGroup4MixDto implements Cloneable{
     @ApiModelProperty(value = "班级", required = true)
     private ClassGroup classGroup;
 
+    @ApiModelProperty(value = "是否允许0课酬")
+    private Boolean allowZeroSalary = false;
+
+    public Boolean getAllowZeroSalary() {
+        return allowZeroSalary;
+    }
+
+    public void setAllowZeroSalary(Boolean allowZeroSalary) {
+        this.allowZeroSalary = allowZeroSalary;
+    }
+
     public Boolean getOnlyCreateClassGroup() {
         return onlyCreateClassGroup;
     }

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/dal/dto/EmployeeDto.java

@@ -48,6 +48,8 @@ public class EmployeeDto {
     /** 离职日期 */
     private java.util.Date demissionDate;
 
+    private String organIdStr;
+
     @ApiModelProperty(value = "部门ID",required = false)
     private List<Long> organIdList;
 
@@ -58,6 +60,14 @@ public class EmployeeDto {
 
     private String postalCode;
 
+    public String getOrganIdStr() {
+        return organIdStr;
+    }
+
+    public void setOrganIdStr(String organIdStr) {
+        this.organIdStr = organIdStr;
+    }
+
     public String getContactAddress() {
         return contactAddress;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -291,7 +291,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param classGroup4MixDtos
      * @return
      */
-    ClassGroup classGroupUpdate(List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception;
+    HttpResponseResult classGroupUpdate(List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception;
 
     /**
      * 班级调整(增加临时班级)

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

@@ -36,14 +36,17 @@ 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.service.*;
+import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.util.collection.ListUtil;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
 import com.alibaba.fastjson.JSON;
@@ -2251,7 +2254,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ClassGroup classGroupUpdate(List<ClassGroup4MixDto> classGroup4MixDtos) {
+    public HttpResponseResult classGroupUpdate(List<ClassGroup4MixDto> classGroup4MixDtos) {
         Date date = new Date();
         Integer classGroupId = classGroup4MixDtos.get(0).getClassGroupId();
         String musicGroupId = classGroup4MixDtos.get(0).getMusicGroupId();
@@ -2307,7 +2310,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 classGroupTeacherMapperDao.insert(tm);
             }
             imUserFriendService.refreshClassImUserFriend(classGroupId);
-            return classGroup;
+            return BaseController.succeed(classGroup);
         }
         if (classGroup4MixDtos.get(0).getCourseTimes().compareTo(0) <= 0) {
             throw new BizException("排课次数必须大于0");
@@ -2450,6 +2453,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         courseScheduleTeacherSalary.setUpdateTime(date);
                         courseScheduleTeacherSalaryService.createMusicGroupCourseTeacherSalary(musicGroup, courseSchedule, courseScheduleTeacherSalary);
                         courseScheduleTeacherSalaryList.add(courseScheduleTeacherSalary);
+                        if(!classGroup4MixDto.getAllowZeroSalary()&&BigDecimal.ZERO.compareTo(courseScheduleTeacherSalary.getExpectSalary())==0){
+                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                            return BaseController.failed(HttpStatus.PARTIAL_CONTENT,"当前课程课酬预计为0,是否继续");
+                        }
                     }
                 }
 
@@ -2473,7 +2480,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if(musicGroup.getStatus() == PROGRESS){
             imUserFriendService.refreshClassImUserFriend(classGroupId);
         }
-        return classGroup;
+        return BaseController.succeed(classGroup);
     }
 
     @Override

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

@@ -721,19 +721,22 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 								if (StringUtils.equals(settlementType, "GRADIENT_SALARY")) {
 									salary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary();
 								}
-								Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroup.getId());
-								if(Objects.isNull(studentNum)){
-									studentNum = 0;
+								int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(courseSchedule.getId());
+								if(studentNum<=0){
+									studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());
 								}
 								courseScheduleTeacherSalary.setExpectSalary(salary.multiply(new BigDecimal(studentNum)));
 							}
 							//线上小班课
 							if(type == CourseScheduleType.HIGH_ONLINE){
-								Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroup.getId());
-								if(Objects.isNull(studentNum)){
-									studentNum = 0;
+								int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(courseSchedule.getId());
+								if(studentNum<=0){
+									studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());
 								}
 								BigDecimal salary = JSON.parseObject(tdms.getSalaryRuleJson()).getBigDecimal(studentNum+"");
+								if(studentNum<=0){
+									salary = new BigDecimal(0);
+								}
 								courseScheduleTeacherSalary.setExpectSalary(salary);
 							}
 
@@ -1462,6 +1465,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			existCours.setUpdateTime(now);
 			existCours.setStartClassTime(ac.getStartClassTime());
 			existCours.setEndClassTime(DateUtil.addMinutes(existCours.getStartClassTime(), singleClassMinutes));
+
+			if(!DateUtil.isSameDay(existCours.getStartClassTime(), existCours.getEndClassTime())){
+				throw new BizException("课程暂不支持跨天");
+			}
 		}
 
 		Date startDateTime = existCourses.stream().min(Comparator.comparing(CourseSchedule::getStartClassTime)).get().getStartClassTime();
@@ -3025,10 +3032,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if (Objects.isNull(newCourseSchedule.getGroupType())) {
                 newCourseSchedule.setGroupType(oldCourseSchedule.getGroupType());
             }
-
-            if(CourseStatusEnum.OVER.equals(oldCourseSchedule.getStatus())&&newCourseSchedule.getStartClassTime().compareTo(date)<0){
-            	throw new BizException("调整无效,已结束不能调整至已结束");
-			}
             
             //课程是否已结算
             int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(oldCourseSchedule.getId().intValue());
@@ -3129,6 +3132,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if (newCourseSchedule.getEndClassTime().before(date)) {
                 newCourseSchedule.setStatus(CourseStatusEnum.OVER);
             }
+
+			if(newCourseSchedule.getStartClassTime().compareTo(date)<0){
+				throw new BizException("调整无效,不能调整至已结束");
+			}
             
 			if (newCourseSchedule.getType() == CourseScheduleType.PRACTICE) {
 				PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(newCourseSchedule.getMusicGroupId()));
@@ -4381,29 +4388,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			params.put("offset", pageInfo.getOffset());
             results = courseScheduleDao.endFindCourseSchedules(params);
             List<Long> courseScheduleIds = results.stream().map(CourseScheduleEndDto::getId).collect(Collectors.toList());
-            //Map<Long, String> studentIdMap = MapUtil.convertIntegerMap(courseScheduleStudentPaymentDao.getStudentIdMap(courseScheduleIds));
             List<Integer> teacherIds=results.stream().filter(t->Objects.nonNull(t.getActualTeacherId())).map(CourseSchedule::getActualTeacherId).collect(Collectors.toList());
 
             List<Map<Integer, String>> nameIdMaps = teacherDao.queryNameByIdList(teacherIds);
             Map<Integer, String> nameIdMap=MapUtil.convertIntegerMap(nameIdMaps);
 
-			//List<Map<Long, String>> coursesSettlementTimeMaps = courseScheduleTeacherSalaryDao.getCoursesSettlementTime(courseScheduleIds);
-			//Map<Long, String> coursesSettlementTimeMap = MapUtil.convertIntegerMap(coursesSettlementTimeMaps);
-
-			/*List<Long> practiceIds = results.stream().filter(e -> PRACTICE.equals(e.getGroupType())).map(e -> Long.valueOf(e.getMusicGroupId())).collect(Collectors.toList());
-			Map<Long, PracticeGroup> idPracticeMap = new HashMap<>();
-			if(!CollectionUtils.isEmpty(practiceIds)){
-				List<PracticeGroup> practiceGroups = practiceGroupDao.getWithIds(practiceIds);
-                idPracticeMap = practiceGroups.stream().collect(Collectors.toMap(PracticeGroup::getId, e->e));
-			}*/
-
 			List<Map<Long, Long>> courseMergeCourseNum = courseScheduleDao.countCourseMergeCourseNum(courseScheduleIds);
 			Map<Long, Long> courseMergeCourseNumMap = new HashMap<>();
 			if(!CollectionUtils.isEmpty(courseMergeCourseNum)){
 				courseMergeCourseNumMap = MapUtil.convertIntegerMap(courseMergeCourseNum);
 			}
 
-
 			//获取班级声部名称
             List<Map<Integer, String>> classGroupSubjectNameMaps = classGroupDao.findClassGroupSubjectNameMaps(courseScheduleIds);
             Map<Integer, String> classGroupSubjectNameMap = MapUtil.convertIntegerMap(classGroupSubjectNameMaps);
@@ -4411,9 +4406,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				result.setTeacher(null);
 				result.setTeacherName(nameIdMap.get(result.getActualTeacherId()));
 				result.setSubjectName(classGroupSubjectNameMap.get(result.getId()));
-				//result.setStudentId(studentIdMap.get(result.getId()));
-				//result.setPracticeGroup(idPracticeMap.get(Long.valueOf(result.getMusicGroupId())));
-				//result.setSettlementTime(coursesSettlementTimeMap.get(result.getId()));
 				result.setIsSettlement(Objects.isNull(result.getSettlementTime())?0:1);
 				if(courseMergeCourseNumMap.containsKey(result.getId())){
 					result.setBeMerged(courseMergeCourseNumMap.get(result.getId())>0?true:false);

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

@@ -252,7 +252,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             Teacher teacher = idTeacherMap.get(courseScheduleTeacherSalary.getUserId());
 
             boolean notPositive = Objects.nonNull(teacher)&&Objects.nonNull(teacher.getFormalStaffDate())&&courseScheduleTeacherSalary.getCourseSchedule().getClassDate().compareTo(teacher.getFormalStaffDate())<0;
-            boolean isProbationPeriod = Objects.nonNull(teacher)&&Objects.isNull(teacher.getFormalStaffDate())&&ProbationPeriodEnum.TRY.equals(teacher.getIsProbationPeriod());
+            boolean isProbationPeriod = Objects.nonNull(teacher)&&Objects.nonNull(teacher.getIsProbationPeriod())&&ProbationPeriodEnum.TRY.equals(teacher.getIsProbationPeriod());
 
             //如果上课日期在转正日期之前的按80%结算
             if(Objects.isNull(teacher)||notPositive||isProbationPeriod){
@@ -369,7 +369,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             Teacher teacher = idTeacherMap.get(courseScheduleTeacherSalary.getUserId());
 
             boolean notPositive = Objects.nonNull(teacher)&&Objects.nonNull(teacher.getFormalStaffDate())&&courseScheduleTeacherSalary.getCourseSchedule().getClassDate().compareTo(teacher.getFormalStaffDate())<0;
-            boolean isProbationPeriod = Objects.nonNull(teacher)&&Objects.isNull(teacher.getFormalStaffDate())&&ProbationPeriodEnum.TRY.equals(teacher.getIsProbationPeriod());
+            boolean isProbationPeriod = Objects.nonNull(teacher)&&Objects.nonNull(teacher.getIsProbationPeriod())&&ProbationPeriodEnum.TRY.equals(teacher.getIsProbationPeriod());
 
             if(Objects.isNull(teacher)||notPositive||isProbationPeriod){
                 expectSalary = expectSalary.multiply(new BigDecimal("0.8"));
@@ -560,7 +560,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 //未转正
                 boolean notPositive = Objects.nonNull(teacher)&&Objects.nonNull(teacher.getFormalStaffDate())&&courseSchedule.getClassDate().compareTo(teacher.getFormalStaffDate())<0;
                 //试用期
-                boolean isProbationPeriod = Objects.nonNull(teacher)&&Objects.isNull(teacher.getFormalStaffDate())&&ProbationPeriodEnum.TRY.equals(teacher.getIsProbationPeriod());
+                boolean isProbationPeriod = Objects.nonNull(teacher)&&Objects.nonNull(teacher.getIsProbationPeriod())&&ProbationPeriodEnum.TRY.equals(teacher.getIsProbationPeriod());
 
                 //如果上课日期在转正日期之前的按80%结算
                 if(Objects.isNull(teacher)||notPositive||isProbationPeriod){
@@ -644,7 +644,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             }
 
             boolean notPositive = Objects.nonNull(teacher)&&Objects.nonNull(teacher.getFormalStaffDate())&&courseSchedule.getClassDate().compareTo(teacher.getFormalStaffDate())<0;
-            boolean isProbationPeriod = Objects.nonNull(teacher)&&Objects.isNull(teacher.getFormalStaffDate())&&ProbationPeriodEnum.TRY.equals(teacher.getIsProbationPeriod());
+            boolean isProbationPeriod = Objects.nonNull(teacher)&&Objects.nonNull(teacher.getIsProbationPeriod())&&ProbationPeriodEnum.TRY.equals(teacher.getIsProbationPeriod());
 
             if(Objects.isNull(teacher)||notPositive||isProbationPeriod){
                 teacherSalary = teacherSalary.multiply(new BigDecimal("0.8"));
@@ -1199,22 +1199,25 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 if(Objects.isNull(salary)){
                     throw new BizException("课酬设置异常");
                 }
-                Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());
-                if(Objects.isNull(studentNum)){
-                    studentNum = 0;
+                int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(courseSchedule.getId());
+                if(studentNum<=0){
+                    studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());
                 }
                 salary = salary.multiply(new BigDecimal(studentNum));
             }
             //线上小班课
             if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)) {
-                Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());
-                if(Objects.isNull(studentNum)){
-                    studentNum = 0;
+                int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(courseSchedule.getId());
+                if(studentNum<=0){
+                    studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());
                 }
                 if(studentNum>5){
                     studentNum=5;
                 }
                 salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum+"");
+                if(studentNum<=0){
+                    salary = new BigDecimal(0);
+                }
             }
 
             if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.MUSIC_NETWORK)) {

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

@@ -1,12 +1,10 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.service.ImUserFriendService;
 import org.apache.commons.lang3.StringUtils;
@@ -18,10 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
-import com.ym.mec.biz.dal.dao.ClassGroupDao;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
-import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.EmployeeDto;
 import com.ym.mec.biz.dal.dto.EmployeeLevelDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
@@ -42,6 +36,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
+import org.springframework.util.CollectionUtils;
 
 @Service
 public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  implements EmployeeService {
@@ -62,6 +57,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	private ClassGroupDao classGroupDao;
 	@Autowired
 	private ImUserFriendService imUserFriendService;
+	@Autowired
+	private OrganizationDao organizationDao;
 
 	@Override
 	public BaseDAO<Integer, Employee> getDAO() {
@@ -149,6 +146,27 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = employeeDao.queryEmployByOrganId(params);
+			List<Integer> allOrganIds = new ArrayList<>();
+			for (EmployeeDto employeeDto : dataList) {
+				if(StringUtils.isBlank(employeeDto.getOrganIdStr())){
+					continue;
+				}
+				List<Integer> organIds = Arrays.stream(employeeDto.getOrganIdStr().split(",")).map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+				allOrganIds.addAll(organIds);
+			}
+			if(!CollectionUtils.isEmpty(allOrganIds)){
+				List<Organization> allOrgans = organizationDao.findOrgans(allOrganIds);
+				for (EmployeeDto employeeDto : dataList) {
+					if(StringUtils.isBlank(employeeDto.getOrganIdStr())){
+						continue;
+					}
+					List<Integer> organIds = Arrays.stream(employeeDto.getOrganIdStr().split(",")).map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+					List<Organization> organs = allOrgans.stream().filter(organ -> organIds.contains(organ.getId())).collect(Collectors.toList());
+					List<String> organNames = organs.stream().map(Organization::getName).collect(Collectors.toList());
+					employeeDto.setOrganNameList(organNames);
+					employeeDto.setOrganIdList(organIds.stream().mapToLong(Long::valueOf).boxed().collect(Collectors.toList()));
+				}
+			}
 		}
 		if (count == 0) {
 			dataList = new ArrayList<>();

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

@@ -141,6 +141,9 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 		//获取班级关联的学员列表
 		Set<Integer> studentIds = classGroupStudentMapperDao.queryStudentIdsByClassGroupId(courseSchedule.getClassGroupId(),null,null);
 		ClassGroup classGroup = classGroupDao.get(courseSchedule.getClassGroupId());
+		if(classGroup == null){
+			return;
+		}
 		GroupType groupType = classGroup.getGroupType();
 		List<ImUserFriend> imUserFriends = saveImUserFriends(studentIds, teacherIds, groupType, classGroup.getMusicGroupId());
 		if(imUserFriends.size() > 0){

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

@@ -45,9 +45,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			throw new BizException("获取用户信息失败");
 		}
 		Integer userId = sysUser.getId();
-		if(sysUser.getIsSuperAdmin()){
-			userId = null;
-		}
 		return organizationDao.queryEmployeeOrgan(userId);
 	}
 
@@ -72,4 +69,4 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		}
 			return org;
 	}
-}
+}

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
@@ -667,7 +667,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }*/
         Date date = new Date();
         String musicGroupId = studentRegistration.getMusicGroupId();
-        
+
         studentRegistration.setCreateTime(date);
         studentRegistration.setUpdateTime(date);
 
@@ -793,7 +793,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             }
             studentPaymentOrder.setExpectAmount(reduce);
             studentPaymentOrderService.insert(studentPaymentOrder);
-            
+
             //当前学员是否以前存在过当前乐团
             if (phoneAndMusicGroupId != null) {
                 studentRegistration.setId(phoneAndMusicGroupId.getId());
@@ -1406,10 +1406,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (student == null) {
             throw new BizException("用户注册信息不存在，无法更新");
         }
+        student.setName(studentRegistration.getName());
         student.setParentsName(studentRegistration.getParentsName());
         student.setIdCardNo(studentRegistration.getIdCardNo());
-        update(student);
-        studentRegistrationDao.updateUser(student.getUserId(), student.getParentsName(), student.getIdCardNo(), studentRegistration.getCertificateType());
+        student.setGender(studentRegistration.getGender());
+        update(studentRegistration);
+        studentRegistrationDao.updateUser(student.getUserId(),student.getName(), student.getParentsName(), student.getIdCardNo(), student.getGender(),studentRegistration.getCertificateType());
         // 添加用户电子签章账户
         if(CertificateTypeEnum.IDENTITY.getCode().equals(studentRegistration.getCertificateType())){
             contractService.register(student.getUserId(), student.getParentsName(), student.getIdCardNo(), student.getParentsPhone());

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/CourseScheduleMapper.xml

@@ -2346,7 +2346,7 @@
             s.name_ schoole_name_,
             o.name_ organ_name_,
             CASE WHEN COUNT(sa.id_) > 0 THEN 1 ELSE 0 END isCallNames,
-            CASE WHEN COUNT(ta.id_) > 0 THEN '1' ELSE '0' END is_complaints_
+            CASE WHEN COUNT(CASE WHEN ta.is_complaints_ = 1 THEN 1 ELSE NULL END) > 0 THEN '1' ELSE '0' END is_complaints_
         FROM
             course_schedule cs
             LEFT JOIN school s ON cs.schoole_id_=s.id_
@@ -2355,8 +2355,14 @@
             left join teacher_attendance ta on ta.course_schedule_id_ = cs.id_
             LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_
             <include refid="endFindCourseSchedulesCondition"/>
-        GROUP BY cs.id_
-        ORDER BY course_start_time_,cs.id_
+        GROUP BY
+            cs.class_date_,
+            cs.start_class_time_,
+            cs.id_
+        ORDER BY
+            cs.class_date_,
+            cs.start_class_time_,
+            cs.id_
         <include refid="global.limit"/>
     </select>
 
@@ -2485,7 +2491,6 @@
             AND (cs.music_group_id_=#{search} OR cs.id_=#{search} OR cs.name_ LIKE CONCAT( '%', #{search}, '%' ))
         </if>
         <if test="searchType == 'ERR_ATTENDANCE'">
-            AND cs.class_date_>='2021-02-20'
             AND ta.teacher_id_ = cs.actual_teacher_id_
             AND cs.status_ = 'OVER'
             AND (ta.sign_in_status_ != 1 OR ta.sign_out_status_ != 1 OR sa.status_ != 'NORMAL') AND ta.dispose_content_ IS NULL

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

@@ -185,21 +185,16 @@
         <result property="demissionDate" column="demission_date_"/>
         <result property="contactAddress" column="contact_address_"/>
         <result property="postalCode" column="postal_code_"/>
+        <result property="organIdStr" column="organ_id_str_"/>
         <collection property="roleNames" ofType="string" javaType="list">
             <result column="role_name_"/>
         </collection>
-        <collection property="organNameList" ofType="string" javaType="list">
-            <result column="organ_name_list_"/>
-        </collection>
         <collection property="roleIds" ofType="integer" javaType="list">
             <result column="role_id_"/>
         </collection>
-        <collection property="organIdList" ofType="Long" javaType="list">
-            <result column="organ_id_list_"/>
-        </collection>
     </resultMap>
     <select id="queryEmployByOrganId" resultMap="EmployeeDto">
-        SELECT ue.*,o.name_ organ_name_list_,o.id_ organ_id_list_,sr.role_name_,sr.id_ role_id_
+        SELECT ue.*,ue.organ_id_ organ_id_str_,sr.role_name_,sr.id_ role_id_
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
         e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_
         FROM employee e
@@ -230,7 +225,6 @@
         ORDER BY e.create_time_ DESC <include refid="global.limit"/>) ue
         LEFT JOIN sys_user_role sur ON sur.user_id_ = ue.user_id_
         LEFT JOIN sys_role sr ON sr.id_ = sur.role_id_
-        LEFT JOIN organization o ON FIND_IN_SET(o.id_,ue.organ_id_)
     </select>
 
     <select id="queryEmployByOrganIdCount" resultType="int">

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

@@ -520,7 +520,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.expect_amount_ > 0
+		AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpcd.expect_amount_ > 0 AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
 		<if test="organIds!=null and organIds.size()>0">
 			AND mg.organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -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-01'
 		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-01'
 		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-biz/src/main/resources/config/mybatis/StudentApplyRefundsMapper.xml

@@ -90,10 +90,10 @@
         SELECT sar.*,spo.expect_amount_,spo.actual_amount_,u.username_ FROM student_apply_refunds sar left join student_payment_order spo on sar.orig_payment_order_id_ = spo.id_ left join sys_user u on sar.user_id_ = u.id_
         where 1=1 
         <if test="startTime != null">
-            and sar.create_time_ &gt;= #{startTime}
+            and DATE_FORMAT(sar.create_time_,"%Y-%m-%d") &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
         </if>
         <if test="endTime != null">
-            and sar.create_time_ &lt;= #{endTime}
+            and DATE_FORMAT(sar.create_time_,"%Y-%m-%d") &lt;= DATE_FORMAT(#{endTime},"%Y-%m-%d")
         </if>
         <if test="status!=null and status!=''">
             and sar.status_=#{status}
@@ -109,10 +109,10 @@
 		SELECT count(1) FROM student_apply_refunds sar left join student_payment_order spo on sar.orig_payment_order_id_ = spo.id_ left join sys_user u on sar.user_id_ = u.id_
 		where 1=1 
         <if test="startTime != null">
-            and sar.create_time_ &gt;= #{startTime}
+            and DATE_FORMAT(sar.create_time_,"%Y-%m-%d") &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
         </if>
         <if test="endTime != null">
-            and sar.create_time_ &lt;= #{endTime}
+            and DATE_FORMAT(sar.create_time_,"%Y-%m-%d") &lt;= DATE_FORMAT(#{endTime},"%Y-%m-%d")
         </if>
         <if test="status!=null and status!=''">
             and sar.status_=#{status}

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

@@ -619,7 +619,26 @@
     </select>
 
     <update id="updateUser">
-        UPDATE sys_user SET real_name_ = #{realName},id_card_no_=#{idCardNo},certificate_type_=#{certificateType},update_time_=NOW() WHERE id_=#{id}
+        UPDATE sys_user
+        <set>
+            <if test="name != null">
+                username_ = #{name},
+            </if>
+            <if test="realName != null">
+                real_name_ = #{realName},
+            </if>
+            <if test="idCardNo != null">
+                id_card_no_ = #{idCardNo},
+            </if>
+            <if test="certificateType != null">
+                certificate_type_ = #{certificateType},
+            </if>
+            <if test="gender != null">
+                gender_ = #{gender},
+            </if>
+            update_time_=NOW()
+            WHERE id_=#{id}
+        </set>
     </update>
     <update id="updateCurrentClass" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
         UPDATE student_registration sr SET sr.current_grade_ = #{currentGrade},sr.current_class_ = #{currentClass},sr.current_grade_date_= NOW(),sr.update_time_ = NOW()

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

@@ -574,7 +574,7 @@
                 AND ta.complaints_status_ = #{complaintsStatus}
             </if>
             <if test="search != null and search != ''">
-                AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR ta.teacher_id_ = #{search})
+                AND (ta.course_schedule_id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR ta.teacher_id_ = #{search})
             </if>
             <if test="courseScheduleStartDate != null and courseScheduleStartDate != ''">
                 AND cs.class_date_ >= #{courseScheduleStartDate}

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

@@ -5,11 +5,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 import javax.annotation.Resource;
 
@@ -161,9 +157,9 @@ public class MusicGroupController extends BaseController {
         if (musicGroup == null) {
             return failed("乐团不存在");
         }
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
 
-        if (userId == null) {
-            SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser != null && Objects.nonNull(sysUser.getId())) {
             userId = sysUser.getId();
         }
 
@@ -196,6 +192,9 @@ public class MusicGroupController extends BaseController {
         }
         studentRegistration.setOwnershipType(musicGroup.getOwnershipType());
         studentRegistration.setChargeTypeId(musicGroup.getChargeTypeId());
+        if(sysUser != null){
+            studentRegistration.setGender(sysUser.getGender());
+        }
 
         return succeed(studentRegistration);
     }

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

@@ -42,36 +42,36 @@ public class MusicGroupRegisterController extends BaseController {
     @ApiOperation(value = "新增学生报名信息")
     @PostMapping("/add")
     public HttpResponseResult add(@RequestBody StudentRegistration studentRegistration) throws Exception {
-    	
-    	SysUser sysUser = sysUserFeignService.queryUserInfo();
+
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        
+
         Date date = new Date();
         MusicGroup musicGroup = musicGroupService.get(studentRegistration.getMusicGroupId());
         if (musicGroup == null) {
             return failed("乐团信息不存在");
         }
-        
-        if (DateUtil.daysBetween(musicGroup.getApplyExpireDate(),date) > 1) {
+
+        if (DateUtil.daysBetween(musicGroup.getApplyExpireDate(), date) > 1 && studentRegistration.getId() == null) {
             return failed("乐团已截止报名");
         }
-        
-        if(studentRegistration.getId() != null){
-            return  succeed(studentRegistrationService.updateStudent(studentRegistration));
+
+        if (studentRegistration.getId() != null) {
+            return succeed(studentRegistrationService.updateStudent(studentRegistration));
         }
 
         if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {
             studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
-        }else{
+        } else {
             studentRegistration.setPaymentStatus(PaymentStatusEnum.NO);
         }
-        
-        if(studentRegistration.getUserId() == null){
-        	studentRegistration.setUserId(sysUser.getId());
+
+        if (studentRegistration.getUserId() == null) {
+            studentRegistration.setUserId(sysUser.getId());
         }
-        
+
         studentRegistration.setOrganId(musicGroup.getOrganId());
         return succeed(studentRegistrationService.addStudent(studentRegistration));
     }

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

@@ -266,7 +266,7 @@ public class ClassGroupController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('classGroup/classGroupUpdate')")
     @ApiImplicitParams({@ApiImplicitParam(name = "ClassGroup4MixDto", value = "添加班级结构", required = true, dataType = "String")})
     public HttpResponseResult classGroupUpdate(@RequestBody List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception {
-        return succeed(classGroupService.classGroupUpdate(classGroup4MixDtos));
+        return classGroupService.classGroupUpdate(classGroup4MixDtos);
     }
 
     @ApiOperation(value = "小班报名详情")
@@ -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) {
@@ -2013,7 +2025,7 @@ public class ExportController extends BaseController {
         try {
 
             String[] header = {"分部", "单位编号", "单位名称", "联系人", "职位", "手机号", "是否启用"};
-            String[] body = {"organization.name", "id", "name", "linkman", "job", "mobileNo", "isEnable"};
+            String[] body = {"organization.name", "id", "name", "linkman", "job", "mobileNo","isEnable == true ? '是':'否'"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=cooperationOrgan-" + DateUtil.getDate(new Date()) + ".xls");
@@ -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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @RequestMapping("school")
 @Api(tags = "学校(教学点)服务")
@@ -78,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());
@@ -90,7 +90,6 @@ public class SchoolController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
         return succeed(schoolService.queryPageDetail(queryInfo));
     }
 
@@ -102,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();
@@ -114,7 +112,6 @@ public class SchoolController extends BaseController {
                     return failed("非法请求");
                 }
             }
-        }
         return succeed(schoolService.queryByOrganId(organId));
     }
 
@@ -125,7 +122,10 @@ public class SchoolController extends BaseController {
         if (teacher == null) {
             return failed("用户信息获取失败");
         }
-        String organId = teacher.getTeacherOrganId().toString();
+        String organId = new String();
+        if(Objects.nonNull(teacher.getTeacherOrganId())){
+            organId = teacher.getTeacherOrganId().toString();
+        }
         if(StringUtils.isEmpty(teacher.getFlowOrganRange())){
             organId += "," + teacher.getFlowOrganRange();
         }

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));
     }