diff --git a/app/user_db_func.py b/app/user_db_func.py index 3d4d75f..6c814c2 100644 --- a/app/user_db_func.py +++ b/app/user_db_func.py @@ -25,7 +25,7 @@ class UserDbHelper(TableDbHelperBase): return md5.hexdigest() # 返回十六进制的哈希值 def login(self, userno, password_md5): - sql_query = "select password,token, last_modify_pdw_time from `user` where userno='%s'" % (userno) + sql_query = "select password,token, last_modify_pwd_time from `user` where userno='%s'" % (userno) users = self.do_select(sql_query) if len(users) != 1: logging.error('query_ledger error! %s' % (sql_query)) @@ -34,7 +34,7 @@ class UserDbHelper(TableDbHelperBase): str_md5 = self.generate_md5(users[0]['password']) if str_md5==password_md5: - return users[0]['token'], users[0]['last_modify_pdw_time'] + return users[0]['token'], users[0]['last_modify_pwd_time'] else: return '', '' @@ -135,7 +135,7 @@ class UserDbHelper(TableDbHelperBase): logging.error('用户密码错误,请检查用户密码是否正确! %s, %s' % (res[0]['password'], password)) return 2, None, None else: - return 0, res[0]['role'], res[0]['last_modify_pdw_time'] + return 0, res[0]['role'], res[0]['last_modify_pwd_time'] def modify_password(self, userid, new_password): sql = "update user set password = '%s' where userno = '%s'" % (new_password, userid) diff --git a/app/user_worker.py b/app/user_worker.py index 0b73446..e4b8a82 100644 --- a/app/user_worker.py +++ b/app/user_worker.py @@ -86,7 +86,7 @@ def do_get_user_info(params, token): 'department': user['department']} if user['role'] == 'manager': all_areas = db_user.query_all_area_infos() - user_area_info = list(all_areas.keys()) + user_area_info = list(all_areas.values()) else: user_area_ids = db_user.query_areaid_list(user['userno']) user_area_info = []