diff --git a/safesite/daoru.py b/safesite/daoru.py
index 3685203e..bcdf134b 100644
--- a/safesite/daoru.py
+++ b/safesite/daoru.py
@@ -175,15 +175,20 @@ def drtodotroubles(companyid,path,userid):
     parts = Partment.objects.filter(partlink__contains=',' + companyid + ',')|Partment.objects.filter(partid=companyid) #获取所有部门
     for i in parts:
         partdict[i.partname] = i
-    for i in Dickey.objects.filter(dicparent__dicid=14):
+    for i in Dickey.objects.filter(dicparent__dicid=14).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
+                                                       companyid+',')).exclude(nousecomps__contains=','+companyid+','):
         jclxdict[i.dickeyname] = i
-    for i in Dickey.objects.filter(dicparent__dicid=18):
+    for i in Dickey.objects.filter(dicparent__dicid=18).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
+                                                       companyid+',')).exclude(nousecomps__contains=','+companyid+','):
         yhdjdict[i.dickeyname] = i
-    for i in Dickey.objects.filter(dicparent__dicid=15):
+    for i in Dickey.objects.filter(dicparent__dicid=15).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
+                                                       companyid+',')).exclude(nousecomps__contains=','+companyid+','):
         yhlxdicto[i.dickeyname] = i
-    for i in Dickey.objects.filter(Q(dicparent__dicid=16)|Q(dicparent__dicid=17)):
+    for i in Dickey.objects.filter(Q(dicparent__dicid=16)|Q(dicparent__dicid=17)).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
+                                                       companyid+',')).exclude(nousecomps__contains=','+companyid+','):
         yhlbdict[i.dickeyname] = i
-    for i in Dickey.objects.filter(dicparent__dicid=19):
+    for i in Dickey.objects.filter(dicparent__dicid=19).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
+                                                       companyid+',')).exclude(nousecomps__contains=','+companyid+','):
         yhpgdict[i.dickeyname] = i
     for i in Area.objects.filter(usecomp__partid=companyid):
         yhqydict[i.name]=i
@@ -230,9 +235,9 @@ def drtodotroubles(companyid,path,userid):
                     fxsj = fxsj.replace(' ','')
                     if '-' in fxsj:
                         obj.fxsj = datetime.strptime(fxsj,'%Y-%m-%d').date()
-                    elif '.' in fdate:
+                    elif '.' in fxsj:
                         obj.fxsj = datetime.strptime(fxsj,'%Y.%m.%d').date()
-                    elif '/' in fdate:
+                    elif '/' in fxsj:
                         obj.fxsj = datetime.strptime(fxsj,'%Y/%m/%d').date()
             if yhqy in yhqydict:
                 obj.yhqy = yhqydict[yhqy]
@@ -256,9 +261,9 @@ def drtodotroubles(companyid,path,userid):
                     zgqx = zgqx.replace(' ','')
                     if '-' in zgqx:
                         obj.zgqx = datetime.strptime(zgqx,'%Y-%m-%d').date()
-                    elif '.' in fdate:
+                    elif '.' in zgqx:
                         obj.zgqx = datetime.strptime(zgqx,'%Y.%m.%d').date()
-                    elif '/' in fdate:
+                    elif '/' in zgqx:
                         obj.zgqx = datetime.strptime(zgqx,'%Y/%m/%d').date()
             if yyfx:
                 obj.yyfx = yyfx
diff --git a/safesite/views.py b/safesite/views.py
index 21d60596..5e54484a 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -1963,7 +1963,7 @@ def troublehandle(req):
         troubleid = req.GET.get('troubleid')
         a = Trouble.objects.filter(troubleid=troubleid)
         x = a.values('yhnum', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj', 'yhlb__dickeyname', 'yhpg__dickeyname', 'yhdd', 'fxbm__partname', 'yhdj__dickeyname', 'yhpg__dickeyname',
-                     'jclx__dickeyname', 'yhlx__dicname', 'yyfx', 'zgcs', 'yhtp', 'zghtp', 'zgms', 'zgbm__partname', 'zgr__name', 'zgqx', 'yhqy__name', 'yhqy__id', 'yhlxo', 'yhlxo__dickeyname')[0]
+                     'jclx__dickeyname', 'yhlx__dicname', 'yyfx', 'zgcs', 'yhtp', 'zghtp', 'zgms', 'zgbm__partname', 'zgr__name', 'zgqx', 'yhqy__name', 'yhqy__id', 'yhlxo', 'yhlxo__dickeyname', 'fxbm', 'jclx')[0]
         b = TroubleAccess.objects.filter(troubleid=a[0]).order_by(
             'accesssj').values('clr__name', 'opinion', 'action', 'accesssj')
         x['lcxq'] = list(b)
@@ -7843,6 +7843,8 @@ def apitroublefollowtask(req):
         data = json.loads(req.body.decode('utf-8'))
         TroubleFollowTask.objects.filter(id=data['id']).update(usable=0)
         return JsonResponse({'code': 1})
+    elif a=='mytodonum':
+        return JsonResponse({'code': 1, 'mytodonum':TroubleFollowTask.objects.filter(user__userid=userid,usable=1).count()})
 
 def apiriskacttask(req):
     a = req.GET.get('a')