Skip to content

A
Automat
Commit 9aa1cb99 by Aeolus
Options

update

parent 8adbf126
Showing with 8 additions and 6 deletions
myapps/pc_management/api/machine_portal.py
...@@ -238,9 +238,10 @@ def run_distribute_machine(): ...@@ -238,9 +238,10 @@ def run_distribute_machine():
return_machine_no = [] return_machine_no = []
for i in machine_nos: for i in machine_nos:
admin_machines = AdminMachine.query.filter_by(user_id=g.user.id, machine_no=i, status=1).first() if g.user.level != 1:
if not admin_machines: admin_machines = AdminMachine.query.filter_by(user_id=g.user.id, machine_no=i, status=1).first()
continue if not admin_machines:
continue
machine = Machine.query.filter_by(machine_no=i).first() machine = Machine.query.filter_by(machine_no=i).first()
if not machine: if not machine:
continue continue
...@@ -275,9 +276,10 @@ def run_distribute_tallyman_machine(): ...@@ -275,9 +276,10 @@ def run_distribute_tallyman_machine():
return_machine_no = [] return_machine_no = []
for i in machine_nos: for i in machine_nos:
admin_machines = AdminMachine.query.filter_by(user_id=g.user.id, machine_no=i, status=1).first() if g.user.level != 1:
if not admin_machines: admin_machines = AdminMachine.query.filter_by(user_id=g.user.id, machine_no=i, status=1).first()
continue if not admin_machines:
continue
machine = Machine.query.filter_by(machine_no=i).first() machine = Machine.query.filter_by(machine_no=i).first()
if not machine: if not machine:
continue continue
......
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