--no commit message

app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/footer/FgFooterController.java

@@ -12,6 +12,7 @@ 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.bg.FgFooterVo;
 import com.zrqx.sysuser.commons.form.bg.FooterVo;
 import com.zrqx.sysuser.commons.model.footer.Footer;
 import com.zrqx.sysuser.commons.model.footer.FooterColumn;
@@ -29,13 +30,10 @@ public class FgFooterController {
 	@Autowired
 	private FgFooterService footerService;
 	
-	@ApiOperation(value = "查询页脚" , notes = "按条件分页查询页脚")
-	@GetMapping(value = "/page")
-	public CallBack<PageInfo<Footer>> getPageList(PageParam pageParam){
-		if(null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy("createTime desc");
-		}
-		return CallBack.success(footerService.queryAll(pageParam));
+	@ApiOperation(value = "查询页脚及内容" , notes = "查询页脚及内容")
+	@GetMapping(value = "/get")
+	public CallBack<List<FgFooterVo>> getPageList(){
+		return CallBack.success(footerService.getPageList());
 	}
 	@ApiOperation(value = "查询栏目" , notes = "查询所有栏目内容")
 	@GetMapping(value = "/list")

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/footer/FgFooterService.java

@@ -3,6 +3,7 @@ package com.zrqx.sysuser.fg.service.footer;
 import java.util.List;
 
 import com.zrqx.core.service.BaseService;
+import com.zrqx.sysuser.commons.form.bg.FgFooterVo;
 import com.zrqx.sysuser.commons.form.bg.FooterVo;
 import com.zrqx.sysuser.commons.model.footer.Footer;
 import com.zrqx.sysuser.commons.model.footer.FooterColumn;
@@ -13,4 +14,6 @@ public interface FgFooterService extends BaseService<Footer, Integer> {
 
 	List<FooterColumn> getList();
 
+	List<FgFooterVo> getPageList();
+
 }

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/footer/FgFooterServiceImpl.java

 package com.zrqx.sysuser.fg.service.footer;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,6 +8,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.sysuser.commons.form.bg.FgFooterVo;
 import com.zrqx.sysuser.commons.form.bg.FooterVo;
 import com.zrqx.sysuser.commons.model.footer.Footer;
 import com.zrqx.sysuser.commons.model.footer.FooterColumn;
@@ -34,9 +37,23 @@ public class FgFooterServiceImpl extends BaseServiceImpl<Footer, Integer> implem
 
 	@Override
 	public List<FooterColumn> getList() {
-		
 		return mapper.getList();
 	}
 
+	@Override
+	public List<FgFooterVo> getPageList() {
+		List<FgFooterVo> voList = new ArrayList<FgFooterVo>();
+		List<FooterColumn> list = mapper.getList();
+		list.forEach(v ->{
+			FgFooterVo vo = new FgFooterVo();
+			BeanUtils.copyProperties(v, vo);
+			List<FooterVo> list2 = mapper.selectById(v.getId());
+			List<Footer> copyList = BeanUtils.copyList(list2, Footer.class);
+			vo.setList(copyList);
+			voList.add(vo);
+		});
+		return voList;
+	}
+
 
 }