From 70e75350a1a24147ddbc50f8051ba8fd510f0c3e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 13:25:59 +0800
Subject: [PATCH] 安装用户 是否删除 过滤
---
src/app/business/services/http/sensors.service.ts | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/app/business/services/http/sensors.service.ts b/src/app/business/services/http/sensors.service.ts
index 5ba7466..1c18e3e 100644
--- a/src/app/business/services/http/sensors.service.ts
+++ b/src/app/business/services/http/sensors.service.ts
@@ -12,7 +12,8 @@
private urls = {
list: environment.SERVER_BASH_URL + '/sensor/page-list',
save: environment.SERVER_BASH_URL + '/sensor/add-or-modify',
- delete: environment.SERVER_BASH_URL + '/sensor/delete-by-ids'
+ delete: environment.SERVER_BASH_URL + '/sensor/delete-by-ids',
+ listByVersionId: environment.SERVER_BASH_URL + '/sensor/list-by-vid',
};
constructor(private http: _HttpClient) { }
public getPagingList(page: PageBean, queryText: string): Observable<PageBean> {
@@ -22,13 +23,20 @@
example.or().andEqualTo({name: 'version', value: queryText});
}
let orderByClause = '';
- if ( page.getOrderByClause != null && page.getOrderByClause instanceof Function) {
- orderByClause = page.getOrderByClause();
+ if (!!page) {
+ if (page.getOrderByClause != null && page.getOrderByClause instanceof Function) {
+ orderByClause = page.getOrderByClause();
+ }
+ } else {
+ page = {pageSize: 0, pageIndex: 0};
}
const param: PageBean = {pageSize: page.pageSize, pageIndex: page.pageIndex,
queryParams: example.getSqlParam(), orderByClause: orderByClause};
return this.http.get(this.urls.list, param);
}
+public getPageByVersionId(versionId: number): Observable<PageBean> {
+ return this.http.get(this.urls.listByVersionId, {versionId: versionId});
+}
public save(data: any): Observable<any> {
return this.http.post(this.urls.save, data);
}
--
Gitblit v1.8.0