Merge https://e.coding.net/ctcdevteam/safesite

safesite/views.py

@@ -4958,6 +4958,11 @@ def apisuggest(req):
 # 特别操作
 def apitool(req):
     a = req.GET.get('a')
+    # if a == 'correctjobjctime':
+    #     for i in Checkjob.objects.all():
+    #         if i.jctime2 is None:
+    #             i.jctime2 = i.endtime
+    #             i.save()
     if a == 'correctgrouptype':
         for company in Partment.objects.filter(iscompany=1):
             users = User.objects.filter(usecomp = company)
@@ -8733,7 +8738,7 @@ def checkprojects(req):
          obj.content=data['content']
          obj.jctime = data['jctime'] if data.get('jctime', None) else obj.starttime
          obj.jctime2 = data['jctime2'] if data.get('jctime2', None) else obj.endtime
-         obj.zgtime = data['zgtime']
+         obj.zgtime = data['zgtime'] if data.get('zgtime', None) else None
          if yhtp:
              obj.yhtp=yhtp
          obj.zghtp=zghtp