diff --git a/groups/views.py b/groups/views.py
index 46e26bf6..792175ed 100644
--- a/groups/views.py
+++ b/groups/views.py
@@ -183,7 +183,7 @@ class CompanyCreateView(CreateView):
                 menus = list(role.permissions.all().values_list('menuid',flat=True))
                 s_models.Group.objects.create(groupname='超管', grouptype=0, usecomp=obj, menulist=menus)
                 s_models.Group.objects.create(groupname='安全员', grouptype=1, usecomp=obj, menulist=menus)
-                s_models.Group.objects.create(groupname='全体用户', grouptype=3, usecomp=obj, menulist=menus)
+                s_models.Group.objects.create(groupname='全体用户', grouptype=3, usecomp=obj, menulist=[11])
                 z = s_models.Group.objects.create(groupname='主管', grouptype=2,usecomp=obj, menulist=menus)
                 z.users.add(adminuser)
                 s_models.Yjsetup.objects.create(monthyhavg=100, safev=50, warnv=75, alertv=100, maxv=200, yhpgqz=4,
diff --git a/safesite/templates/question.html b/safesite/templates/question.html
index 6ac0dbc2..b8fa2f2e 100644
--- a/safesite/templates/question.html
+++ b/safesite/templates/question.html
@@ -178,27 +178,6 @@
             $("#tmtable").datagrid('reload');
         }
     });
-    $('#gwfl').datagrid({
-        url: 'grouphandle?a=list',
-        
-        rownumbers: true,
-        singleSelect: true,
-        striped: true,
-        method: 'get',
-        border:false,
-        title:'按岗位',
-        columns: [[
-            { field: 'groupid', title: '用户组ID', hidden: true },
-            { field: 'groupname', title: '名称', width: 100 },
-            { field: 'grouptype', title: '类型', hidden:true,width: 100 },
-        ]],
-        onClickRow: function (index, row) {
-            
-            $("#tmtable").datagrid({
-                url: 'api/question?a=listall&gwlx=' + row.groupid,
-            });
-        }
-    });
     $('#tmtable').datagrid({
         url:'api/question',
         queryParams:{a:'listall'},
diff --git a/safesite/templates/questionadd.html b/safesite/templates/questionadd.html
index 0e4823b8..6e32823b 100644
--- a/safesite/templates/questionadd.html
+++ b/safesite/templates/questionadd.html
@@ -18,20 +18,6 @@
                 <input id="cate" name="cate" style="width:480px;" class="easyui-combotree" data-options="label:'分类',"
                     editable=false required = true/>
             </div>
-            <!-- <div style="margin-bottom:5px">
-                <input id="station" name="station" style="width:480px;" class="easyui-combobox"
-                    data-options="label:'岗位'," editable=false />
-                <script>
-                    $.get('grouphandle?a=list', function (res) {
-                        $("#station").combobox({
-                            data: res.rows,
-                            valueField: 'groupid',
-                            textField: 'groupname',
-                        });
-                    })
-
-                </script>
-            </div> -->
             <div style="margin-bottom:5px">
                     <input class="easyui-tagbox" value="" name="label" label="标签" style="width:480px;" data-options="prompt:'输入字符回车形成标签'">
                 </div>
diff --git a/safesite/templates/questionadd2.html b/safesite/templates/questionadd2.html
index 9a18720c..2ad50c89 100644
--- a/safesite/templates/questionadd2.html
+++ b/safesite/templates/questionadd2.html
@@ -41,20 +41,6 @@
             });
                 </script>
             </div>
-            <!-- <div style="margin-bottom:5px">
-                <input id="station" name="station" style="width:480px;" class="easyui-combobox"
-                    data-options="label:'岗位'," editable=false />
-                <script>
-                    $.get('grouphandle?a=list', function (res) {
-                        $("#station").combobox({
-                            data: res.rows,
-                            valueField: 'groupid',
-                            textField: 'groupname',
-                        });
-                    })
-
-                </script>
-            </div> -->
             <div style="margin-bottom:5px">
                 <input class="easyui-tagbox" value="" name="label" label="标签" style="width:480px;"
                     data-options="prompt:'输入字符回车形成标签'">
diff --git a/safesite/templates/questionadd3.html b/safesite/templates/questionadd3.html
index 022417a4..d645e4d7 100644
--- a/safesite/templates/questionadd3.html
+++ b/safesite/templates/questionadd3.html
@@ -42,20 +42,6 @@
 
                 </script>
             </div>
-            <!-- <div style="margin-bottom:5px">
-                <input id="station" name="station" style="width:480px;" class="easyui-combobox"
-                    data-options="label:'岗位'," editable=false />
-                <script>
-                    $.get('grouphandle?a=list', function (res) {
-                        $("#station").combobox({
-                            data: res.rows,
-                            valueField: 'groupid',
-                            textField: 'groupname',
-                        });
-                    })
-
-                </script>
-            </div> -->
             <div style="margin-bottom:5px">
                     <input class="easyui-tagbox" value="" name="label" label="标签" style="width:480px;" data-options="prompt:'输入字符回车形成标签'">
                 </div>
diff --git a/safesite/templates/questionchoose.html b/safesite/templates/questionchoose.html
index 9641b8fa..9cbf9099 100644
--- a/safesite/templates/questionchoose.html
+++ b/safesite/templates/questionchoose.html
@@ -106,26 +106,6 @@
             $("#tmtable").datagrid('reload');
         }
     });
-        // $('#gwfl').datagrid({
-        //     url: 'grouphandle?a=list',
-        //     rownumbers: true,
-        //     singleSelect: true,
-        //     striped: true,
-        //     method: 'get',
-        //     border:false,
-        //     title:'按岗位',
-        //     columns: [[
-                
-        //         { field: 'groupid', title: '用户组ID', hidden: true },
-        //         { field: 'groupname', title: '名称', width: 100 },
-        //         { field: 'grouptype', title: '类型', hidden:true,width: 100 },
-        //     ]],
-        //     onClickRow: function (index, row) {
-        //         $("#tmtable").datagrid({
-        //             url: 'api/question?a=listall&gwlx=' + row.groupid,
-        //         });
-        //     }
-        // });
         $('#tmtable').datagrid({
             url:'api/question?a=listall',
             rownumbers: true,
diff --git a/safesite/templates/questionedit.html b/safesite/templates/questionedit.html
index c836c84f..0f965968 100644
--- a/safesite/templates/questionedit.html
+++ b/safesite/templates/questionedit.html
@@ -18,20 +18,6 @@
                 <input id="cate" name="cate" style="width:480px;" class="easyui-combotree" data-options="label:'分类',"
                     editable=false required = true/>
             </div>
-            <!-- <div style="margin-bottom:5px">
-                <input id="station" name="station" style="width:480px;" class="easyui-combobox"
-                    data-options="label:'岗位'," editable=false />
-                <script>
-                    $.get('grouphandle?a=list', function (res) {
-                        $("#station").combobox({
-                            data: res.rows,
-                            valueField: 'groupid',
-                            textField: 'groupname',
-                        });
-                    })
-
-                </script>
-            </div> -->
             <div style="margin-bottom:5px">
                     <input class="easyui-tagbox" value="" name="label" label="标签" style="width:480px;" data-options="prompt:'输入字符回车形成标签'">
                 </div>
diff --git a/safesite/templates/questionedit2.html b/safesite/templates/questionedit2.html
index 7852fe8f..6d3d8ef1 100644
--- a/safesite/templates/questionedit2.html
+++ b/safesite/templates/questionedit2.html
@@ -41,20 +41,6 @@
             });
                 </script>
             </div>
-            <!-- <div style="margin-bottom:5px">
-                <input id="station" name="station" style="width:480px;" class="easyui-combobox"
-                    data-options="label:'岗位'," editable=false />
-                <script>
-                    $.get('grouphandle?a=list', function (res) {
-                        $("#station").combobox({
-                            data: res.rows,
-                            valueField: 'groupid',
-                            textField: 'groupname',
-                        });
-                    })
-
-                </script>
-            </div> -->
             <div style="margin-bottom:5px">
                 <input class="easyui-tagbox" value="" name="label" label="标签" style="width:480px;"
                     data-options="prompt:'输入字符回车形成标签'">
diff --git a/safesite/templates/questionedit3.html b/safesite/templates/questionedit3.html
index 6b25122c..c4241c79 100644
--- a/safesite/templates/questionedit3.html
+++ b/safesite/templates/questionedit3.html
@@ -42,20 +42,6 @@
 
                 </script>
             </div>
-            <!-- <div style="margin-bottom:5px">
-                <input id="station" name="station" style="width:480px;" class="easyui-combobox"
-                    data-options="label:'岗位'," editable=false />
-                <script>
-                    $.get('grouphandle?a=list', function (res) {
-                        $("#station").combobox({
-                            data: res.rows,
-                            valueField: 'groupid',
-                            textField: 'groupname',
-                        });
-                    })
-
-                </script>
-            </div> -->
             <div style="margin-bottom:5px">
                     <input class="easyui-tagbox" value="" name="label" label="标签" style="width:480px;" data-options="prompt:'输入字符回车形成标签'">
                 </div>
diff --git a/safesite/templates/usergroup.html b/safesite/templates/usergroup.html
index fc145ebc..478b37a7 100644
--- a/safesite/templates/usergroup.html
+++ b/safesite/templates/usergroup.html
@@ -37,7 +37,7 @@
     </div>
 <script>
      $('#grouptable').datagrid({
-        url: 'grouphandle?a=list2',
+        url: 'grouphandle?a=list',
         rownumbers: true,
         singleSelect: true,
         striped: true,
@@ -55,9 +55,16 @@
             }else{
                 $('#addguser,#delguser').show()
             }
-            $("#gusertable").datagrid({
+            if(row.grouptype==3){
+                $("#gusertable").datagrid({
+                data: [],
+            });
+            }else{
+                $("#gusertable").datagrid({
                 url: 'getuser?groupid=' + row.groupid + '&a=datagrid',
             });
+            }
+            
         }
     });
     $('#addgroup').linkbutton({
diff --git a/safesite/views.py b/safesite/views.py
index a75df7b7..3bb780c0 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -3937,7 +3937,7 @@ def apicompany(req):
                 Group.objects.create(
                     groupname='安全员', grouptype=1, usecomp=part, menulist=menurights)
                 Group.objects.create(
-                    groupname='全体用户', grouptype=3, usecomp=part, menulist=menurights)
+                    groupname='全体用户', grouptype=3, usecomp=part, menulist=[11])
                 z = Group(groupname='主管', grouptype=2,
                           usecomp=part, menulist=menurights)
                 z.save()
@@ -4865,6 +4865,12 @@ def apisuggest(req):
 # 特别操作
 def apitool(req):
     a = req.GET.get('a')
+    if a == 'correctgrouptype':
+        for company in Partment.objects.filter(iscompany=1):
+            users = User.objects.filter(usecomp = company)
+            instance, _ = Group.objects.get_or_create(usecomp=company,grouptype=3,defaults={'groupname':'全体用户', 'grouptype':3, 'usecomp':company, 'menulist':[11]})
+            instance.users.add(*users)
+        return JsonResponse({'code': 1})
     if a == 'updatecompany':
         for i in User.objects.all():
             companyid = getcompany(i.userid)