Sfoglia il codice sorgente

乐团档案又一次莫名其妙的兼容前端传参

zouxuan 4 anni fa
parent
commit
df16902972

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/MusicGroupQuestionnaireMapper.xml

@@ -76,6 +76,9 @@
 			<if test="search != null and search != ''">
 				AND mgq.music_group_id_ = #{search}
 			</if>
+			<if test="musicGroupId != null and musicGroupId != ''">
+				AND mgq.music_group_id_ = #{musicGroupId}
+			</if>
 		</where>
 	</sql>
 	

+ 2 - 1
mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupQuestionnaireController.java

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire;
+import com.ym.mec.biz.dal.page.MusicGroupPerformanceQueryInfo;
 import com.ym.mec.biz.service.MusicGroupQuestionnaireService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
@@ -70,7 +71,7 @@ public class MusicGroupQuestionnaireController extends BaseController {
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('musicGroupQuestionnaire/queryPage')")
-    public Object queryPage(QueryInfo queryInfo){
+    public Object queryPage(MusicGroupPerformanceQueryInfo queryInfo){
         return succeed(musicGroupQuestionnaireService.queryPage(queryInfo));
     }
 }

+ 2 - 1
mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupQuestionnaireController.java

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller.education;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire;
+import com.ym.mec.biz.dal.page.MusicGroupPerformanceQueryInfo;
 import com.ym.mec.biz.service.MusicGroupQuestionnaireService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
@@ -65,7 +66,7 @@ public class EduMusicGroupQuestionnaireController extends BaseController {
 
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
-    public Object queryPage(QueryInfo queryInfo){
+    public Object queryPage(MusicGroupPerformanceQueryInfo queryInfo){
         return succeed(musicGroupQuestionnaireService.queryPage(queryInfo));
     }
 }