update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -473,5 +473,5 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      */
     int countStudent(Map<String, Object> params);
     
-    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(Integer organId);
+    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(@Param("organId") Integer organId);
 }

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

@@ -62,7 +62,7 @@
         <result column="name_" property="organName"/>
         <result column="job_nature" property="jobNature"/>
         <result column="demisson_status" property="demissionStatus" />
-        <result column="status_" property="status"
+        <result column="status_" property="status"/>
         <result column="vip1" property="vip1"/>
         <result column="vip2" property="vip2"/>
         <result column="vip3" property="vip3"/>
@@ -1138,7 +1138,7 @@
     <select id="queryTeacherDefaultSalary" resultMap="TeacherDefaultSalaryDto">
     	SELECT t.`id_` ,su.`real_name_` ,o.`name_` ,
 		case when t.`job_nature_` = 'PART_TIME' then '兼职' when  t.`job_nature_` = 'FULL_TIME' then '全职' else '临时工' end job_nature,
-		case when t.`demission_date_` IS NULL then '在职' else '离职' end 在职状态 demisson_status, 
+		case when t.`demission_date_` IS NULL then '在职' else '离职' end demisson_status,
 		case when su.`lock_flag_` = 1 then '冻结' WHEN su.`lock_flag_` = 9 then '锁定' else '正常' end status_,
 		max(case when gc.`name_` = '1V1' then gs.`offline_classes_salary_` else 0 end) vip1,
 		max(case when gc.`name_` = '1V2' then gs.`offline_classes_salary_` else 0 end) vip2,