儿童节活动

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

@@ -85,6 +85,9 @@
         <result property="normalNum" column="normal_num_"/>
         <result property="organName" column="organ_name_"/>
         <result property="reserveNum" column="reserve_num_"/>
+        <result property="organId" column="organ_id_"/>
+        <result property="cooperationOrganId" column="cooperation_organ_id_"/>
+        <result property="musicGroupId" column="music_group_id_"/>
     </resultMap>
     <select id="queryChildrenStatistics" resultMap="ChildrenStatisticsDtoMap">
         SELECT o.name_ organ_name_,co.name_ cooperation_organ_name_,mg.name_ music_group_name_,COUNT(sr.user_id_) normal_num_,cdr.organ_id_,

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

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