Преглед изворни кода

add 教务端统计乐团回款

river пре 4 година
родитељ
комит
826243987e

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -812,7 +812,7 @@
         <if test="organId != null">
             AND FIND_IN_SET(mg.organ_id_,#{organId})
         </if>
-        <if test="cooperationOrgans != null">
+        <if test="cooperationOrganIds != null">
             AND mg.cooperation_organ_id_ IN
             <foreach collection="cooperationOrganIds" item="cooperationOrganId" open="(" close=")" separator=",">
                 #{cooperationOrganId}

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/controller/education/EduRegisterController.java

@@ -71,7 +71,7 @@ public class EduRegisterController extends BaseController {
         //是乐团主管,不是分部经理
         List<Integer> cooperationOrganIds = null;
         List<Integer> userRole = employeeDao.queryUserRole(sysUser.getId());
-        if (userRole.contains(SysUserRole.EDUCATIONAL_TEACHER) && !userRole.contains(SysUserRole.SECTION_MANAGER)) {
+        if (!sysUser.getIsSuperAdmin() && userRole.contains(SysUserRole.EDUCATIONAL_TEACHER) && !userRole.contains(SysUserRole.SECTION_MANAGER)) {
             List<CooperationOrgan> cooperationOrgans = cooperationOrganDao.getCooperationOrganByEduTeacherId(sysUser.getId());
             if(cooperationOrgans.size() >0){
                 cooperationOrganIds = cooperationOrgans.stream().map(CooperationOrgan::getId).collect(Collectors.toList());