diff --git a/b/reseller/reseller_add_user.dspy b/b/reseller/reseller_add_user.dspy index 53736dc..2d77f31 100644 --- a/b/reseller/reseller_add_user.dspy +++ b/b/reseller/reseller_add_user.dspy @@ -27,15 +27,16 @@ async def reseller_add_user(ns): try: ns['id'] = uuid() ns['password'] = password_encode(ns['password']) - tenant_orgid = await get_reseller_user_tenant_orgid(sor, ns.get('orgid')) + # tenant_orgid = await get_reseller_user_tenant_orgid(sor, ns.get('orgid')) + tenant_orgid = ns.get('orgid') if not tenant_orgid: return {'status': False, 'msg': '未找到用户所属租户'} user_sql = """select id from users where username = '%s' and tenant_orgid = '%s' and del_flg = '0' limit 1;""" % (ns['username'], tenant_orgid) user = await sor.sqlExe(user_sql, {}) if len(user) >= 1: return {'status': False, 'msg': '用户名重复'} - rolereacs = await sor.R('role', {'role': '管理员', 'del_flg': '0', 'org_type': '1'}) - ns['user_reseller'] = '1' + rolereacs = await sor.R('role', {'role': '管理员', 'del_flg': '0', 'org_type': ns.get('org_type')}) + ns['user_reseller'] = ns.get('org_type') ns['tenant_orgid'] = tenant_orgid await sor.C('users', ns) await sor.C('userrole', {'userid': ns['id'], 'roleid': rolereacs[0]['id'], 'id': uuid()})