Merge branch 'zx_saas_0810' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -488,7 +488,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<TeacherBasicDto> findByFlowOrganRangeTeachers(@Param("organId") String organId);
+    List<TeacherBasicDto> findByFlowOrganRangeTeachers(@Param("organId") String organId,@Param("demissionFlag") Boolean demissionFlag);
 
     /**
      * 根据教师编号列表获取名称map

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

@@ -101,7 +101,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<TeacherBasicDto> findTeachers(String organId);
+    List<TeacherBasicDto> findTeachers(String organId,Boolean demissionFlag);
 
     /**
      * @param subjectId: 科目编号

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

@@ -2299,7 +2299,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public boolean applyQuitMusicGroup(List<SysUserRoleEnum> currentOperatorRoleIds, MusicGroupQuit reqMusicGroupQuit, Integer operatorId) {
 
         Integer userId = reqMusicGroupQuit.getUserId();
@@ -2442,7 +2442,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public boolean approveQuitMusicGroup(List<SysUserRoleEnum> currentOperatorRoleIds, MusicGroupQuit reqMusicGroupQuit) {
         Long id = reqMusicGroupQuit.getId();
         ApprovalStatus status = reqMusicGroupQuit.getStatus();

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

@@ -439,8 +439,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
     }
 
     @Override
-    public List<TeacherBasicDto> findTeachers(String organId) {
-        return teacherDao.findByFlowOrganRangeTeachers(organId);
+    public List<TeacherBasicDto> findTeachers(String organId,Boolean demissionFlag) {
+        return teacherDao.findByFlowOrganRangeTeachers(organId,demissionFlag);
     }
 
     @Override

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

@@ -915,8 +915,11 @@
     <select id="findByFlowOrganRangeTeachers" resultMap="TeacherBasicDto">
         SELECT su.id_,su.username_,su.real_name_,t.organ_id_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
-        WHERE su.del_flag_ = 0 AND su.lock_flag_ = 0 AND t.demission_date_ is null
+        WHERE su.del_flag_ = 0 AND su.lock_flag_ = 0
             AND (INTE_ARRAY(#{organId},t.flow_organ_range_) OR FIND_IN_SET(t.organ_id_,#{organId}))
+        <if test="demissionFlag != null and demissionFlag == false">
+            AND t.demission_date_ IS NULL
+        </if>
     </select>
 
     <select id="findByTeacherIds" resultMap="Teacher">

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

@@ -84,9 +84,12 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "获取分部所有老师")
     @GetMapping("/findTeachers")
     @PreAuthorize("@pcs.hasPermissions('teacher/findTeachers','system')")
-    public HttpResponseResult findTeachers(String organId) {
+    public HttpResponseResult findTeachers(String organId,Boolean demissionFlag) {
         organId = organizationService.getEmployeeOrgan(organId);
-        return succeed(teacherService.findTeachers(organId));
+        if (demissionFlag == null){
+            demissionFlag = false;
+        }
+        return succeed(teacherService.findTeachers(organId,demissionFlag));
     }
 
     @ApiOperation(value = "根据科目获取部门下的教师")