Browse Source

update:新增分页查询接口

yonge 4 years ago
parent
commit
227b122aae
1 changed files with 17 additions and 2 deletions
  1. 17 2
      cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

+ 17 - 2
cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -47,9 +47,24 @@ public class NewsController extends BaseController {
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/list")
 	public Object getList(NewsInformationQueryInfo queryInfo) {
-		if(queryInfo.getTenantId() == null){
-			queryInfo.setTenantId(1);
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || user.getId() == null) {
+			queryInfo.setOrganId(43);
+		} else {
+			queryInfo.setOrganId(user.getOrganId());
 		}
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+		int count = sysNewsInformationDao.queryCount(params);
+		if(count == 0){
+			queryInfo.setMemo(null);
+		}
+		return succeed(sysNewsInformationService.queryPage(queryInfo));
+	}
+
+	@ApiOperation("资讯列表分页查询")
+	@GetMapping(value = "/queryPage")
+	public Object queryPage(NewsInformationQueryInfo queryInfo) {
 		
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);