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(@Param("organId") Integer organId);
+    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(@Param("organIdList") String organIdList);
 }

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

@@ -8,6 +8,7 @@ import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -189,8 +190,8 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
     
     /**
      * 查询老师默认课酬
-     * @param organId
+     * @param organIdList
      * @return
      */
-    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(Integer organId);
+    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(String organIdList);
 }

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

@@ -583,8 +583,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
 	@Override
-	public List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(Integer organId) {
-		return teacherDao.queryTeacherDefaultSalary(organId);
+	public List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(String organIdList) {
+		return teacherDao.queryTeacherDefaultSalary(organIdList);
 	}
 
 }

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

@@ -1182,8 +1182,8 @@
 		LEFT JOIN teacher_default_practice_group_salary pgs ON pgs.user_id_ = t.id_
 		LEFT JOIN teacher_default_music_group_salary mgs ON mgs.user_id_ = t.id_
 		<where>
-			<if test="organId != null">
-                AND t.organ_id_ = #{organId}
+			<if test="organIdList != null">
+                AND find_in_set(t.organ_id_,#{organIdList})
             </if>
 		</where>
 		GROUP BY t.`id_` 

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

@@ -1980,12 +1980,12 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "老师默认课酬导出")
     @RequestMapping("export/teacherDefaultSalary")
     @PreAuthorize("@pcs.hasPermissions('export/teacherDefaultSalary')")
-	public void exportTeacherDefaultSalary(Integer organId, HttpServletResponse response) throws IOException {
+	public void exportTeacherDefaultSalary(String organIdList, HttpServletResponse response) throws IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			throw new IOException("用户信息获取失败");
 		}
-		List<TeacherDefaultSalaryDto> pageList = teacherService.queryTeacherDefaultSalary(organId);
+		List<TeacherDefaultSalaryDto> pageList = teacherService.queryTeacherDefaultSalary(organIdList);
 		if (pageList.size() <= 0) {
 			response.setStatus(200);
 			response.setContentType("Content-Type: application/json;charset=UTF-8");