--no commit message

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/controller/activity/FgActivityApplyController.java

@@ -3,6 +3,7 @@ package com.zrqx.fg.sysuser.controller.activity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -19,6 +20,7 @@ import com.zrqx.core.form.sysuser.fg.activity.QueryActivityApplyForm;
 import com.zrqx.core.form.sysuser.fg.activity.UpdateActivityApplyForm;
 import com.zrqx.core.model.sysuser.activity.ActivityApply;
 import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.datatype.StringUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
@@ -50,7 +52,7 @@ public class FgActivityApplyController {
 	@ApiOperation("报名记录分页列表")
 	@GetMapping(SysUserRequestPath.PAGE)
 	public CallBack<PageInfo<ActivityApplyVo>> page(PageParam pageParam){
-		if (pageParam.getOrderBy() != null) {
+		if (StringUtils.isEmpty(pageParam.getOrderBy())) {
 			pageParam.setOrderBy(" createTime desc");
 		}
 		return CallBack.success(activityApplyService.page(pageParam));

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/controller/news/FgfgNewsFeedBackController.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,7 +49,7 @@ public class FgfgNewsFeedBackController {
 	@ApiOperation("意见反馈分页列表")
 	@GetMapping(SysUserRequestPath.PAGE)
 	public CallBack<PageInfo<NewsFeedBackVo>> page(Integer oid,PageParam pageParam){
-		if (pageParam.getOrderBy() != null) {
+		if (StringUtils.isEmpty(pageParam.getOrderBy())) {
 			pageParam.setOrderBy(" createTime desc");
 		}
 		return CallBack.success(fgNewsFeedBackService.page(oid,pageParam));