|
@@ -101,15 +101,11 @@ def index_user():
|
|
|
@base.route('/system/user/list', methods=['GET'])
|
|
|
def user_grid():
|
|
|
filters = []
|
|
|
- if request.form.get('loginname'):
|
|
|
- filters.append(User.LOGINNAME.like('%' + request.form.get('loginname') + '%'))
|
|
|
- if request.form.get('name'):
|
|
|
- filters.append(User.NAME.like('%' + request.form.get('name') + '%'))
|
|
|
- if request.form.get('sex'):
|
|
|
- filters.append(User.SEX == request.form.get('sex'))
|
|
|
- if request.form.get('createdatetime1') and request.form.get('createdatetime2'):
|
|
|
- filters.append(User.CREATEDATETIME > request.form.get('createdatetime1'))
|
|
|
- filters.append(User.CREATEDATETIME < request.form.get('createdatetime2'))
|
|
|
+ if 'userName' in request.args:
|
|
|
+ filters.append(User.LOGINNAME.like('%' + request.args['userName'] + '%'))
|
|
|
+ if 'params[beginTime]' in request.args and 'params[endTime]' in request.args:
|
|
|
+ filters.append(User.CREATEDATETIME > request.args['params[beginTime]'])
|
|
|
+ filters.append(User.CREATEDATETIME < request.args['params[endTime]'])
|
|
|
|
|
|
order_by = []
|
|
|
if request.form.get('sort'):
|
|
@@ -120,8 +116,8 @@ def user_grid():
|
|
|
else:
|
|
|
order_by.append(getattr(User,request.form.get('sort').upper()))
|
|
|
|
|
|
- page = request.form.get('page', 1, type=int)
|
|
|
- rows = request.form.get('rows', 10, type=int)
|
|
|
+ page = request.args.get('pageNum', 1, type=int)
|
|
|
+ rows = request.args.get('pageSize', 10, type=int)
|
|
|
pagination = User.query.filter(*filters).order_by(*order_by).paginate(
|
|
|
page, per_page=rows, error_out=False)
|
|
|
users = pagination.items
|