Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -68,6 +68,7 @@ public class TeacherDefaultPracticeGroupSalaryServiceImpl extends BaseServiceImp
 					for (CourseScheduleTeacherSalary ts : updateTeacherSalaryList) {
 						ts.setExpectSalary(salary);
 						ts.setUpdateTime(date);
+						list.add(ts);
 					}
 					if (list.size() > 0) {
 						courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalarys(list);

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

@@ -371,7 +371,7 @@
             AND (t.organ_id_=#{organId} OR FIND_IN_SET(#{organId},t.flow_organ_range_))
             AND t.job_nature_='FULL_TIME'
             AND su.del_flag_=0 AND su.lock_flag_=0
-            AND t.organ_id_!=36 AND t.organ_id_!=38
+            AND t.organ_id_!=36
         GROUP BY su.id_
     </select>
 

mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -29,7 +29,7 @@ public class PracticeGroupController extends BaseController {
     private PracticeGroupService practiceGroupService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
-    List<Integer> excludeOrganIds=new ArrayList<>(Arrays.asList(new Integer[]{36,38}));
+    List<Integer> excludeOrganIds=new ArrayList<>(Arrays.asList(new Integer[]{36}));
 
     @ApiOperation("获取学生的陪练课")
     @GetMapping(value = "/findUserPracticeCourses")
@@ -154,6 +154,9 @@ public class PracticeGroupController extends BaseController {
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
+        if(excludeOrganIds.contains(sysUser.getOrganId())){
+            throw new BizException("请联系老师确认您的所属分部");
+        }
         practiceGroupBuyParams.setStudentId(sysUser.getId());
         return practiceGroupService.buyPracticeGroup(practiceGroupBuyParams);
     }