Commit c9a0abf1 authored by 陈祥烨's avatar 陈祥烨

机构管理逻辑修改

parent 1e346e27
...@@ -48,10 +48,11 @@ public class DataBaseNameListResource { ...@@ -48,10 +48,11 @@ public class DataBaseNameListResource {
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询") @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<DataBaseNameListModel>> queryForPage( public ResponseModel<Page<DataBaseNameListModel>> queryForPage(
@RequestParam(value = "current") int current, @RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) { @RequestParam(value = "size") int size,
@RequestParam Long ipSeq) {
Page<DataBaseNameListModel> page = new Page<>(); Page<DataBaseNameListModel> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(dataBaseNameListService.queryForDataBasePage(page)); return ResponseHelper.buildResponse(dataBaseNameListService.queryForDataBasePage(page,ipSeq));
} }
} }
...@@ -24,8 +24,8 @@ public class DataBaseNameListService extends BaseService<DataBaseNameListModel, ...@@ -24,8 +24,8 @@ public class DataBaseNameListService extends BaseService<DataBaseNameListModel,
/** /**
* 分页查询 * 分页查询
*/ */
public Page<DataBaseNameListModel> queryForDataBasePage(Page<DataBaseNameListModel> page) { public Page<DataBaseNameListModel> queryForDataBasePage(Page<DataBaseNameListModel> page,Long parentId) {
return this.queryForPage(page, null, false); return this.queryForPage(page, null, false, parentId);
} }
/** /**
......
spring.application.name=AMOS-ATL spring.application.name=AMOS-ATL
#server.servlet.context-path=/atl server.servlet.context-path=/atl
server.servlet.context-path=/jcs #server.servlet.context-path=/jcs
#server.port=30201 server.port=30201
server.port=20000 #server.port=20000
spring.profiles.active=dev spring.profiles.active=dev
management.health.elasticsearch.enabled=false management.health.elasticsearch.enabled=false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment