Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java

@@ -59,7 +59,9 @@ public class UserOrderController extends BaseController {
     @ApiOperation(value = "查询导出", notes = "传入orderSearch")
     @PreAuthorize("@pcs.hasPermissions('userOrder/export')")
     public void export(@RequestBody OrderSearch query) {
-        List<UserOrderVo> userOrderVos = userOrderService.selectAllList(query);
+        query.setRows(-1);
+        IPage<UserOrderVo> pages = userOrderService.selectPage(PageUtil.getPage(query), query);
+        List<UserOrderVo> userOrderVos = pages.getRecords();
         List<UserOrderExport> list = new ArrayList<>();
         userOrderVos.forEach(o -> {
             UserOrderExport export = new UserOrderExport();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -481,6 +481,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             student.setName(studentImport.getUserName());
             student.setGender("男".equals(studentImport.getGender()) ? 1 : 0);
             student.setSubjectId(subjectIdNamemap.get(studentImport.getSubjectName()).toString());
+            student.setPhone(studentImport.getPhone());
 
             LocalDate birthday = LocalDate.parse(studentImport.getBirthday(), DateTimeFormatter.ISO_LOCAL_DATE);
             student.setBirthdate(birthday);

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -47,7 +47,7 @@
                 </foreach>
             </if>
             <if test="param.keyword != null and param.keyword != ''">
-                and m.music_sheet_name_ = #{param.keyword}
+                and m.music_sheet_name_ LIKE CONCAT('%',#{param.keyword},'%')
             </if>
         </where>
 	</select>