--no commit message

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/controller/press/PressController.java

@@ -149,6 +149,9 @@ public class PressController {
 	@ApiOperation(value = "导出出版社")
 	@GetMapping(value = MemberRequestPath.EXPORT)
 	public String exportPress(QueryPressForm form, PageParam pageParam, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		if(StringUtils.isEmpty(pageParam.getOrderBy())){
+			pageParam.setOrderBy(" createTime desc ");
+		}
 		Example example = pressService.createExample();
 		Criteria cr = example.createCriteria();
 		if (StringUtils.isNotBlank(form.getName())) {

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/controller/samplebookapply/SampleBookApplyController.java

@@ -119,6 +119,9 @@ public class SampleBookApplyController {
 	@ApiOperation(value = "导出样书券申请单")
 	@GetMapping(value = MemberRequestPath.EXPORT)
 	public String exporSampleBookApply(QuerySampleBookApplyForm form, PageParam pageParam, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		if(StringUtils.isEmpty(pageParam.getOrderBy())){
+			pageParam.setOrderBy(" applyDate desc ");
+		}
 		Example example = sampleBookApplyService.createExample();
 		Criteria cr = example.createCriteria();
 		if (StringUtils.isNotBlank(form.getSchoolName())) {

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/controller/samplebookvoucher/SampleBookVoucherController.java

@@ -56,6 +56,9 @@ public class SampleBookVoucherController {
 	@ApiOperation(value = "导出样书券")
 	@GetMapping(value = MemberRequestPath.EXPORT)
 	public String exportSampleBookApply(QuerySampleBookVoucherForm form, PageParam pageParam, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		if(StringUtils.isBlank(pageParam.getOrderBy())){
+			pageParam.setOrderBy(" sendTime desc ");
+		}
 		Example example = sampleBookVoucherService.createExample();
 		Criteria cr = example.createCriteria();
 		if (StringUtils.isNotBlank(form.getSchoolName())) {

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/controller/school/SchoolController.java

@@ -156,6 +156,9 @@ public class SchoolController {
 	@ApiOperation(value = "导出学校")
 	@GetMapping(value = MemberRequestPath.EXPORT)
 	public String exportSchool(QuerySchoolForm form, PageParam pageParam, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		if(StringUtils.isEmpty(pageParam.getOrderBy())){
+			pageParam.setOrderBy(" createTime desc ");
+		}
 		Example example = schoolService.createExample();
 		Criteria cr = example.createCriteria();
 		if (StringUtils.isNotBlank(form.getName())) {

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/message/MessageRecordServiceImpl.java

@@ -126,7 +126,7 @@ public class MessageRecordServiceImpl extends BaseServiceImpl<MessageRecord,Inte
 			List<Message> pmList = new ArrayList<Message>();
 			if(idsList != null && idsList.size() > 0){
 				for (Integer id : idsList) {
-					pmList.add(new Message(null,id,entity.getId().toString(),MessageIsReadEnum.NOT.getCode()));
+					pmList.add(new Message(null,id,entity.getId(),MessageIsReadEnum.NOT.getCode()));
 				}
 			}
 			Integer size = pmList.size();

com.zrqx.core/src/main/java/com/zrqx/core/model/member/message/Message.java

@@ -23,7 +23,7 @@ public class Message {
 	@ApiModelProperty("会员id")
 	private Integer memberId;
 	@ApiModelProperty("站内信记录id")
-	private String messageRecordId;
+	private Integer messageRecordId;
 	/* {@link MessageIsReadEnum} */
 	@ApiModelProperty("是否已读0未读1已读2删除")
 	private String isRead;

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/service/message/FgMessageRecordServiceImpl.java

@@ -109,7 +109,7 @@ public class FgMessageRecordServiceImpl extends BaseServiceImpl<MessageRecord,In
 			List<Message> pmList = new ArrayList<Message>();
 			if(idsList != null && idsList.size() > 0){
 				for (Integer id : idsList) {
-					pmList.add(new Message(null,id,entity.getId().toString(),MessageIsReadEnum.NOT.getCode()));
+					pmList.add(new Message(null,id,entity.getId(),MessageIsReadEnum.NOT.getCode()));
 				}
 			}
 			Integer size = pmList.size();