diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py
index a427f3b5e..f5e1e343c 100644
--- a/jumpserver/templatetags/mytags.py
+++ b/jumpserver/templatetags/mytags.py
@@ -97,15 +97,15 @@ def bool2str(value):
         return u'否'
 
 
-@register.filter(name='user_readonly')
-def user_readonly(user_id):
-    user = User.objects.filter(id=user_id)
-    if user:
-        user = user[0]
-        if user.role == 'CU':
-            return False
-    return True
-
+# @register.filter(name='user_readonly')
+# def user_readonly(user_id):
+#     user = User.objects.filter(id=user_id)
+#     if user:
+#         user = user[0]
+#         if user.role == 'CU':
+#             return False
+#     return True
+#
 
 @register.filter(name='member_count')
 def member_count(group_id):
diff --git a/juser/views.py b/juser/views.py
index c470013b1..c19556544 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -277,7 +277,8 @@ def dept_member_update(dept, users_id_list):
 def dept_del_ajax(request):
     dept_ids = request.POST.get('dept_ids')
     for dept_id in dept_ids.split(','):
-        DEPT.objects.filter(id=dept_id).delete()
+        if int(dept_id) > 2:
+            DEPT.objects.filter(id=dept_id).delete()
     return HttpResponse("删除成功")
 
 
@@ -810,6 +811,7 @@ def user_detail(request):
         asset_group_permed = user_perm_group_api(user)
         logs_last = Log.objects.filter(user=user.name).order_by('-start_time')[0:10]
         logs_all = Log.objects.filter(user=user.name).order_by('-start_time')
+        logs_num = len(logs_all)
 
     return render_to_response('juser/user_detail.html', locals(), context_instance=RequestContext(request))
 
@@ -825,7 +827,7 @@ def user_del(request):
             return HttpResponseRedirect('/juser/user_list/')
 
     user = User.objects.filter(id=user_id)
-    if user:
+    if user and user[0].username != 'admin':
         user = user[0]
         user.delete()
         server_del_user(user.username)
@@ -843,7 +845,7 @@ def user_del_ajax(request):
             return "error"
     for user_id in user_ids:
         user = User.objects.filter(id=user_id)
-        if user:
+        if user and user[0].username != 'admin':
             user = user[0]
             user.delete()
             server_del_user(user.username)
diff --git a/templates/juser/dept_list.html b/templates/juser/dept_list.html
index 944fa951e..3d81b9e24 100644
--- a/templates/juser/dept_list.html
+++ b/templates/juser/dept_list.html
@@ -73,7 +73,7 @@
 {#                                    <a href="../dept_detail/?id={{ dept.id }}" class="btn btn-xs btn-primary">详情</a>#}
                                     {% ifequal session_role_id 2 %}
                                         <a href="../dept_edit/?id={{ dept.id }}" class="btn btn-xs btn-info">编辑</a>
-                                        <a href="../dept_del/?id={{ dept.id }}" class="btn btn-xs btn-danger">删除</a>
+                                        <a href="../dept_del/?id={{ dept.id }}" class="btn btn-xs btn-danger {% if dept.id < 3 %} disabled {% endif %} } ">删除</a>
                                     {% else %}
                                         <a href="../dept_edit/?id={{ dept.id }}" class="btn btn-xs btn-info disabled">编辑</a>
                                         <a href="../dept_del/?id={{ dept.id }}" class="btn btn-xs btn-danger disabled">删除</a>
@@ -102,8 +102,14 @@
         var check_array = []
         $('#del_btn').click(function(){
             if (confirm("确定删除")) {
-                $(".gradeX input:checked").each(function() {check_array.push($(this).attr("value")) })
-                $(".gradeX input:checked").closest("tr").remove()
+                $(".gradeX input:checked").each(function() {
+                    var id = $(this).attr("value");
+                    if(id > 2){
+                        check_array.push(id);
+                        $(this).closest("tr").remove();
+                    }
+                });
+{#                $(".gradeX input:checked").closest("tr").remove();#}
                 $.post("/juser/dept_del_ajax/",
                     {dept_ids: check_array.join(",")},
                     function(data){
diff --git a/templates/juser/user_detail.html b/templates/juser/user_detail.html
index 811076921..c8aee9e1b 100644
--- a/templates/juser/user_detail.html
+++ b/templates/juser/user_detail.html
@@ -171,8 +171,9 @@
                                         (无)
                                     {% endif %}
                                 </div>
-
+                                {% if logs_num > 10 %}
                                 <button id="show" class="btn btn-primary btn-block m-t"><i class="fa fa-arrow-down"></i> Show All</button>
+                                {% endif %}
 
                             </div>
 
diff --git a/templates/juser/user_list.html b/templates/juser/user_list.html
index bd2a81bea..86a702975 100644
--- a/templates/juser/user_list.html
+++ b/templates/juser/user_list.html
@@ -77,10 +77,10 @@
                                     <a href="../user_detail/?id={{ user.id }}" class="btn btn-xs btn-primary">详情</a>
                                     {% ifequal session_role_id 2 %}
                                     <a href="../user_edit/?id={{ user.id }}" class="btn btn-xs btn-info">编辑</a>
-                                    <a href="../user_del/?id={{ user.id }}" class="btn btn-xs btn-danger">删除</a>
+                                    <a href="../user_del/?id={{ user.id }}" class="btn btn-xs btn-danger {% if user.username == 'admin' %} disabled {% endif %}">删除</a>
                                     {% else %}
-                                    <a href="../user_edit/?id={{ user.id }}" class="btn btn-xs btn-info {% if user.id|user_readonly %} disabled {% endif %}">编辑</a>
-                                    <a href="../user_del/?id={{ user.id }}" class="btn btn-xs btn-danger {% if user.id|user_readonly %} disabled {% endif %}">删除</a>
+                                    <a href="../user_edit/?id={{ user.id }}" class="btn btn-xs btn-info {% if user.role == 'CU' %} disabled {% endif %}">编辑</a>
+                                    <a href="../user_del/?id={{ user.id }}" class="btn btn-xs btn-danger {% if user.role == 'CU' %} disabled {% endif %}">删除</a>
                                     {% endifequal %}
                                 </td>
                             </tr>
@@ -120,8 +120,8 @@
         var check_array = [];
         $('#del_btn').click(function(){
             if (confirm("确定删除")) {
-                $(".gradeX input:checked").each(function() {check_array.push($(this).attr("value")) })
-                $(".gradeX input:checked").closest("tr").remove()
+                $(".gradeX input:checked").each(function() {check_array.push($(this).attr("value")) });
+                $(".gradeX input:checked").closest("tr").remove();
                 $.post("/juser/user_del_ajax/",
                         {ids: check_array.join(",")},
                         function(data){