diff --git a/jasset/views.py b/jasset/views.py
index 8427f9f67..b0d616d92 100644
--- a/jasset/views.py
+++ b/jasset/views.py
@@ -160,7 +160,7 @@ def asset_add(request):
asset_save = af_post.save(commit=False)
if not use_default_auth:
password = request.POST.get('password', '')
- password_encode = CRYPTOR.encrypt(password)
+ password_encode = password
asset_save.password = password_encode
asset_save.is_active = True if is_active else False
asset_save.save()
diff --git a/jperm/views.py b/jperm/views.py
index 2685d6bd6..21204aea5 100644
--- a/jperm/views.py
+++ b/jperm/views.py
@@ -326,10 +326,13 @@ def perm_role_push(request):
task = Tasks(push_resource)
ret = {}
ret_failed = []
- if password_push:
- ret["password_push"] = task.add_multi_user(**role_pass)
- if ret["password_push"].get("status") != "success":
- ret_failed.append(1)
+
+ # 因为要先建立用户，所以password 是必选项，
+ # 而push key是在 password也完成的情况下的 可选项
+ ret["password_push"] = task.add_multi_user(**role_pass)
+ if ret["password_push"].get("status") != "success":
+ ret_failed.append(1)
+
if key_push:
ret["key_push"] = task.push_multi_key(**role_key)
if ret["key_push"].get("status") != "success":
diff --git a/templates/jperm/perm_role_push.html b/templates/jperm/perm_role_push.html
index a524d0cc2..91a4c7a0d 100644
--- a/templates/jperm/perm_role_push.html
+++ b/templates/jperm/perm_role_push.html
@@ -67,16 +67,6 @@