diff --git a/TempLate/GERP/index.html b/TempLate/GERP/index.html index a26dec18..6abb691c 100644 --- a/TempLate/GERP/index.html +++ b/TempLate/GERP/index.html @@ -5,7 +5,7 @@ GERP 管理系统 - + @@ -14,7 +14,7 @@ - +
diff --git a/gvsds/apps/gerp/views/app.py b/gvsds/apps/gerp/views/app.py index 24312e37..44e19c51 100644 --- a/gvsds/apps/gerp/views/app.py +++ b/gvsds/apps/gerp/views/app.py @@ -199,9 +199,9 @@ class AppInstallView(ELTAuthenticatedAPIView): manageable, scope = AppManager.GetManageableCompanies(request) if not manageable: return Response({'code': 403, 'msg': '无权安装应用:您没有可管理的公司'}, status=403) - manageable_set = {c.hex for c in manageable} + manageable_set = {c.hex() for c in manageable} company_bytes = _ParseUUIDList(request.data.get('CompanyUUIDs')) - invalid = [c.hex for c in company_bytes if c.hex not in manageable_set] + invalid = [c.hex() for c in company_bytes if c.hex() not in manageable_set] if invalid: return Response({'code': 403, 'msg': '无权为以下公司安装(不在您的管理范围)'}, status=403) ok, err, count = AppManager.InstallCompanyApps( @@ -247,9 +247,9 @@ class AppUninstallView(ELTAuthenticatedAPIView): manageable, scope = AppManager.GetManageableCompanies(request) if not manageable: return Response({'code': 403, 'msg': '无权停用应用:您没有可管理的公司'}, status=403) - manageable_set = {c.hex for c in manageable} + manageable_set = {c.hex() for c in manageable} company_bytes = _ParseUUIDList(request.data.get('CompanyUUIDs')) - invalid = [c.hex for c in company_bytes if c.hex not in manageable_set] + invalid = [c.hex() for c in company_bytes if c.hex() not in manageable_set] if invalid: return Response({'code': 403, 'msg': '无权为以下公司停用(不在您的管理范围)'}, status=403) ok, err = AppManager.UninstallCompanyApps(company_uuids, app_uuid)