--no commit message

app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/aboutus/FgAboutUsColumnController.java

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm;
 import com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm;
@@ -39,10 +41,11 @@ public class FgAboutUsColumnController {
 		return CallBack.success(service.selectAll());
 	}
 	
-	@ApiOperation(value = "根据栏目id查内容", notes = "根据栏目id查内容")
+	@ApiOperation(value = "根据栏目id查内容列表", notes = "根据栏目id查内容列表")
 	@GetMapping(value = "/page")
-	public CallBack<List<FgAboutusVo>> page(FgAboutusForm form) {
-		return CallBack.success(service.page(form));  
+	public CallBack<PageInfo<FgAboutusVo>> page(PageParam pageParam,FgAboutusForm form) {
+		pageParam.setOrderBy("sort asc,createTime desc");
+		return CallBack.success(service.page(pageParam,form));  
 	}
 	
 }

app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/propaganda/FgPropagandaColumnController.java

@@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.sysuser.commons.form.fg.propaganda.FgQueryPropaganColumnForm;
 import com.zrqx.sysuser.commons.form.fg.propaganda.PropagandaForm;
@@ -41,10 +43,11 @@ public class FgPropagandaColumnController {
 		return CallBack.success(service.selectAll());
 	}
 	
-	@ApiOperation(value = "根据栏目id查内容", notes = "根据栏目id查内容")
+	@ApiOperation(value = "根据栏目id查内容列表", notes = "根据栏目id查内容列表")
 	@GetMapping(value = "/page")
-	public CallBack<List<FgPropagandaVo>> page(PropagandaForm form) {
-		return CallBack.success(service.page(form));  
+	public CallBack<PageInfo<FgPropagandaVo>> page(PageParam pageParam,PropagandaForm form) {
+		pageParam.setOrderBy("sort asc,createTime desc");
+		return CallBack.success(service.page(pageParam,form));  
 	}
 	
 }

app/sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/aboutus/FgAboutUsColumnMapper.java

@@ -25,7 +25,6 @@ public interface FgAboutUsColumnMapper extends BaseMapper<AboutUsColumn>{
 	@Select("<script>"
 			+ " select b.* from  sys_aboutus_content b where 1=1 and status =1 "
 			+ " eq(b.columnId,form.id) "
-			+ " order by createTime desc "
 			+ "</script>")
 	List<AboutUsContent> page(FgAboutusForm form);
 

app/sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/propaganda/FgPropagandaColumnMapper.java

@@ -26,7 +26,6 @@ public interface FgPropagandaColumnMapper extends BaseMapper<PropagandaColumn> {
 	@Select("<script>"
 			+ " select b.* from  sys_propaganda_content b where 1=1 and status =1 "
 			+ " eq(b.columnId,form.id) "
-			+ " order by createTime desc "
 			+ "</script>")
 	List<PropagandaContent> page(@Param("form") PropagandaForm form);
 

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsColumnService.java

@@ -3,6 +3,8 @@ package com.zrqx.sysuser.fg.service.aboutus;
 import java.util.List;
 
 import com.zrqx.core.service.BaseService;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
 import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm;
 import com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm;
 import com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn;
@@ -12,6 +14,6 @@ public interface FgAboutUsColumnService extends BaseService<AboutUsColumn, Integ
 
 	List<AboutUsColumn> getByColumn(FgQueryAboutusColumnForm query);
 
-	List<FgAboutusVo> page(FgAboutusForm form);
+	PageInfo<FgAboutusVo> page(PageParam pageParam, FgAboutusForm form);
 
 }

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsColumnServiceImpl.java

@@ -9,6 +9,8 @@ import org.springframework.stereotype.Service;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
 import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm;
 import com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm;
 import com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn;
@@ -33,7 +35,8 @@ public class FgAboutUsColumnServiceImpl extends BaseServiceImpl<AboutUsColumn, I
 	}
 
 	@Override
-	public List<FgAboutusVo> page(FgAboutusForm form) {
+	public PageInfo<FgAboutusVo> page(PageParam pageParam, FgAboutusForm form) {
+		startPage(pageParam);
 		List<FgAboutusVo> list1 = new ArrayList<FgAboutusVo>();
 		FgAboutusVo vo = new FgAboutusVo();
 		AboutUsColumn column = mapper.selectByPrimaryKey(form.getId());
@@ -41,7 +44,7 @@ public class FgAboutUsColumnServiceImpl extends BaseServiceImpl<AboutUsColumn, I
 		List<AboutUsContent> list = mapper.page(form);
 		vo.setList(list);
 		list1.add(vo);
-		return list1;
+		return new PageInfo<FgAboutusVo>(list1);
 	}
 
 }

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/propaganda/FgPropagandaColumnService.java

@@ -3,6 +3,8 @@ package com.zrqx.sysuser.fg.service.propaganda;
 import java.util.List;
 
 import com.zrqx.core.service.BaseService;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
 import com.zrqx.sysuser.commons.form.fg.propaganda.FgQueryPropaganColumnForm;
 import com.zrqx.sysuser.commons.form.fg.propaganda.PropagandaForm;
 import com.zrqx.sysuser.commons.model.propaganda.PropagandaColumn;
@@ -12,6 +14,6 @@ public interface FgPropagandaColumnService extends BaseService<PropagandaColumn,
 
 	List<PropagandaColumn> getByColumn(FgQueryPropaganColumnForm query);
 
-	List<FgPropagandaVo> page(PropagandaForm form);
+	PageInfo<FgPropagandaVo> page(PageParam pageParam, PropagandaForm form);
 
 }

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/propaganda/FgPropagandaColumnServiceImpl.java

@@ -9,6 +9,8 @@ import org.springframework.stereotype.Service;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
 import com.zrqx.sysuser.commons.form.fg.propaganda.FgQueryPropaganColumnForm;
 import com.zrqx.sysuser.commons.form.fg.propaganda.PropagandaForm;
 import com.zrqx.sysuser.commons.model.propaganda.PropagandaColumn;
@@ -33,7 +35,8 @@ public class FgPropagandaColumnServiceImpl extends BaseServiceImpl<PropagandaCol
 	}
 
 	@Override
-	public List<FgPropagandaVo> page(PropagandaForm form) {
+	public PageInfo<FgPropagandaVo> page(PageParam pageParam, PropagandaForm form) {
+		startPage(pageParam);
 		List<FgPropagandaVo> list1 = new ArrayList<FgPropagandaVo>();
 		FgPropagandaVo vo = new FgPropagandaVo();
 		PropagandaColumn column = mapper.selectByPrimaryKey(form.getId());
@@ -41,7 +44,7 @@ public class FgPropagandaColumnServiceImpl extends BaseServiceImpl<PropagandaCol
 		List<PropagandaContent> list = mapper.page(form);
 		vo.setList(list);
 		list1.add(vo);
-		return list1;
+		return new PageInfo<FgPropagandaVo>(list1);
 	}
 
 }