From 54fe9a2602acc15dc60eaaaa6178aaeafe4fe941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E4=BA=91=E9=9C=84?= <chinacgcgcg@163.com>
Date: Mon, 23 Jan 2017 15:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=80=83=E6=A0=B8=E5=88=86=E6=95=B0?=
 =?UTF-8?q?=E6=AF=94=E8=BE=83=E8=AF=AF=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Class/Announcement/AnnouncementViewController.m                | 1 -
 Class/LearningCenter/OnlineLearning/AssessmentViewController.m | 2 +-
 Class/Login/LoginViewController.m                              | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Class/Announcement/AnnouncementViewController.m b/Class/Announcement/AnnouncementViewController.m
index 6570e7f..c1b1bd0 100644
--- a/Class/Announcement/AnnouncementViewController.m
+++ b/Class/Announcement/AnnouncementViewController.m
@@ -257,7 +257,6 @@
         page.page = ONE;
         page.rows = KROWS;
         _afficheModel.page = page;
-        _afficheModel.dayCountEquals = 20;
         _afficheModel.sort = @"createDate";
         _afficheModel.order = SORTDIRECTION_DESC;
         _afficheModel.departIdEquals = [Shoppersmanager manager].Shoppers.employee.departid;
diff --git a/Class/LearningCenter/OnlineLearning/AssessmentViewController.m b/Class/LearningCenter/OnlineLearning/AssessmentViewController.m
index 4eaec55..fd68b28 100644
--- a/Class/LearningCenter/OnlineLearning/AssessmentViewController.m
+++ b/Class/LearningCenter/OnlineLearning/AssessmentViewController.m
@@ -227,7 +227,7 @@
     studyResult.details = (NSArray<TOStudyResultDetailEntity>*)submitAnswerArray;
     studyResult.grade = [NSNumber numberWithInteger:allScore];
     //判断考核是否合格
-    studyResult.examResult = (self.taskDetails.passGrade < allScore)?@"1":@"0";
+    studyResult.examResult = (self.taskDetails.passGrade <= allScore)?@"1":@"0";
     [XBLoadingView showHUDViewWithDefault];
     WS(weakSelf);
     NSLog(@"%@",[[studyResult toDictionary] JSONString])
diff --git a/Class/Login/LoginViewController.m b/Class/Login/LoginViewController.m
index 6c29b50..5ca6103 100644
--- a/Class/Login/LoginViewController.m
+++ b/Class/Login/LoginViewController.m
@@ -456,7 +456,7 @@
         
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             NSDictionary *dict = returnValue[@"data"];
-            if (!dict) {
+            if (!dict || [dict isKindOfClass:[NSNull class]]) {
                 return;
             }
             UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:[NSString stringWithFormat:@"发现新版本%@,快去更新吧!",dict[@"version"]] preferredStyle:UIAlertControllerStyleAlert];
-- 
2.18.1