From e01108df66658b2b10e8bf28d400db79da1c9eca Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 18 Nov 2020 09:48:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8A=BD=E9=A2=98-=E8=87=AA?=
 =?UTF-8?q?=E5=BB=BA=E5=8A=A0=E5=85=B1=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/examtestadd2.html |  2 +-
 safesite/templates/index.html        |  7 ++++++-
 safesite/views.py                    | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/safesite/templates/examtestadd2.html b/safesite/templates/examtestadd2.html
index 4a6afeb0..4ea7c0d5 100644
--- a/safesite/templates/examtestadd2.html
+++ b/safesite/templates/examtestadd2.html
@@ -94,7 +94,7 @@
             
 		})
     $("#tmfls").combotree({
-        url: 'api/questioncat?a=tree3',
+        url: 'api/questioncat?a=tree4',
         method: 'get',
         multiple: true,
         loadFilter: function (rows) {
diff --git a/safesite/templates/index.html b/safesite/templates/index.html
index 2ea26b3a..acd4c535 100644
--- a/safesite/templates/index.html
+++ b/safesite/templates/index.html
@@ -171,7 +171,12 @@
     <!-- <button type="hidden" id="getb" onclick="test()" /> -->
 
     <script>
-
+        $.messager.show({
+    title:'提示',
+    msg:'每晚10点-11点为维护时间,请尽量不在此时间使用',
+    timeout:5000,
+    showType:'slide'
+});
         var openid = $('#userindex').attr('openid');
         var nickname = $('#userindex').attr('nickname');
         var headimgurl = $('#userindex').attr('headimgurl');
diff --git a/safesite/views.py b/safesite/views.py
index 587cfa67..110792bd 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -6673,6 +6673,18 @@ def apiquestioncat(req):
             parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen')
         return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
     elif a == 'tree3':
+        # 共享分类
+        groups = g_models.Groupmember.objects.filter(member__partid=companyid).values_list('group__id', flat=True)
+        companys = g_models.Groupmember.objects.filter(group__id__in=groups).values_list('member__partid', flat=True).distinct()
+        if companys:
+            pass
+        else:
+            companys = Partment.objects.filter(partid=companyid).values_list('partid', flat=True)
+        list_items = Questioncat.objects.filter(usecomp__in=companys, deletemark=1, isopen=1).annotate(
+            parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen')
+        return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
+    elif a == 'tree4':
+        # 自建+共享分类
         groups = g_models.Groupmember.objects.filter(member__partid=companyid).values_list('group__id', flat=True)
         companys = g_models.Groupmember.objects.filter(group__id__in=groups).values_list('member__partid', flat=True).distinct()
         if companys:
@@ -6680,7 +6692,7 @@ def apiquestioncat(req):
         else:
             companys = Partment.objects.filter(partid=companyid).values_list('partid', flat=True)
         list_items = (Questioncat.objects.filter(usecomp__in=companys, deletemark=1, isopen=1)| Questioncat.objects.filter(
-            usecomp__partid=1, deletemark=1, isopen=1)).annotate(
+            usecomp__partid=companyid, deletemark=1)).distinct().annotate(
             parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen')
         return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
     elif a == 'tree':