zouxuan 5 jaren geleden
bovenliggende
commit
4c7855e189

+ 2 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -626,7 +626,8 @@
 		LEFT JOIN vip_group vg ON (vg.id_ = ts.music_group_id_ AND ts.group_type_ = 'VIP')
 		LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_ = vga.id_
 		LEFT JOIN organization vgo ON vgo.id_ = vg.organ_id_
-		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'VIP' AND ts.settlement_time_ IS NOT NULL
+		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1
+		AND cs.group_type_ = 'VIP' AND ts.settlement_time_ IS NOT NULL AND vg.organ_id_ != 43
 		GROUP BY ts.id_,ta.id_
 	</select>
 	<select id="querySettlementScheduleId" resultType="java.lang.Long">

+ 3 - 0
mec-web/src/main/java/com/ym/mec/web/controller/education/ImGroupNoticeController.java

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.page.GroupNoticeQueryInfo;
 import com.ym.mec.biz.service.ImGroupNoticeService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.im.ImFeignService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,8 @@ public class ImGroupNoticeController extends BaseController {
     private ImGroupNoticeService imGroupNoticeService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private ImFeignService imFeignService;
 
     @ApiOperation(value = "新增")
     @RequestMapping("/add")