Joburgess 5 years ago
parent
commit
b6c31d7c71

+ 4 - 0
edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamLocationController.java

@@ -10,6 +10,7 @@ import com.keao.edu.user.service.ExamLocationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,6 +31,9 @@ public class ExamLocationController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping(value = "/list")
     public HttpResponseResult<PageInfo<ExamLocation>> getList(ExamLocationQueryInfo queryInfo) {
+        if(StringUtils.isBlank(queryInfo.getSearch())){
+            queryInfo.setSearch(null);
+        }
         return succeed(examLocationService.queryPage(queryInfo));
     }
 

+ 1 - 1
edu-user/edu-user-server/src/main/resources/config/mybatis/MusicTheoryMapper.xml

@@ -93,6 +93,6 @@
 		SELECT * FROM music_theory WHERE tenant_id_=#{tenantId}
 	</select>
     <select id="getWithTenantAndLevel" resultMap="MusicTheory">
-		SELECT * FROM music_theory WHERE tenant_id_=#{tenantId} AND level=#{level}
+		SELECT * FROM music_theory WHERE tenant_id_=#{tenantId} AND level_=#{level}
     </select>
 </mapper>