// 消息

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift

@@ -154,23 +154,31 @@ class YHMessageListVC: YHBaseViewController {
         self.viewModel.getUnreadMsgList {
             [weak self] success, error in
             guard let self = self else { return }
-            if success, let msgList = viewModel.msgList {
+            if success {
                 msgArr.removeAll()
+                var hasUnreadMsg = false
                 // 资料填写
-                if let infoMsg = msgList.information, !infoMsg.lastMessage.isEmpty {
-                    msgArr.append(infoMsg)
+                if !self.viewModel.msgList.information.lastMessage.isEmpty {
+                    hasUnreadMsg = true
                 }
                 // 证件上传
-                if let cerMsg = msgList.certificate, !cerMsg.lastMessage.isEmpty  {
-                    msgArr.append(cerMsg)
+                if !self.viewModel.msgList.certificate.lastMessage.isEmpty  {
+                    hasUnreadMsg = true
                 }
                 // 文书定稿
-                if let dratMsg = msgList.draft, !dratMsg.lastMessage.isEmpty {
-                    msgArr.append(dratMsg)
+                if !self.viewModel.msgList.draft.lastMessage.isEmpty {
+                    hasUnreadMsg = true
                 }
                 // 文件签字
-                if let signMsg = msgList.signature, !signMsg.lastMessage.isEmpty {
-                    msgArr.append(signMsg)
+                if !self.viewModel.msgList.signature.lastMessage.isEmpty {
+                    hasUnreadMsg = true
+                }
+                
+                if hasUnreadMsg {
+                    msgArr.append(self.viewModel.msgList.information)
+                    msgArr.append(self.viewModel.msgList.certificate)
+                    msgArr.append(self.viewModel.msgList.draft)
+                    msgArr.append(self.viewModel.msgList.signature)
                 }
                 emptyDataTipsView.isHidden = msgArr.count > 0
                 self.tableView.reloadData()

galaxy/galaxy/Classes/Modules/Message(消息)/M/YHMsgListModel.swift

@@ -52,13 +52,16 @@ class YHMessageInfoModel: SmartCodable {
 }
 
 class YHMsgListModel: SmartCodable {
-    var information: YHMessageInfoModel?
-    var certificate: YHMessageInfoModel?
-    var draft: YHMessageInfoModel?
-    var signature: YHMessageInfoModel?
+    var information: YHMessageInfoModel = YHMessageInfoModel()
+    var certificate: YHMessageInfoModel = YHMessageInfoModel()
+    var draft: YHMessageInfoModel = YHMessageInfoModel()
+    var signature: YHMessageInfoModel = YHMessageInfoModel()
     
     required init() {
-        
+        self.information.type = YHMessageType.infoFill.rawValue
+        self.certificate.type = YHMessageType.cerUpload.rawValue
+        self.draft.type = YHMessageType.draft.rawValue
+        self.signature.type = YHMessageType.fileSign.rawValue
     }
 }
 

galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift

@@ -11,7 +11,7 @@ import SmartCodable
 
 class YHMsgViewModel: NSObject {
     
-    var msgList: YHMsgListModel?
+    var msgList: YHMsgListModel = YHMsgListModel()
     var msgDetailList : [YHDetailMessageModel] = []
     var unreadTotalCount: Int = 0
     
@@ -19,26 +19,27 @@ class YHMsgViewModel: NSObject {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Message.unreadMsgListApi
         let _ = YHNetRequest.getRequest(url: strUrl) { json, code in
-            var dic = json.data
+            let dic = json.data
             printLog("model 是 ==> \(json)")
             if json.code == 200 {
                 guard let result = YHMsgListModel.deserialize(dict: dic as? Dictionary ) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
-                    self.msgList = nil
                     callBackBlock(false, error)
                     return
                 }
                 self.msgList = result
+                self.msgList.information.type = YHMessageType.infoFill.rawValue
+                self.msgList.certificate.type = YHMessageType.cerUpload.rawValue
+                self.msgList.draft.type = YHMessageType.draft.rawValue
+                self.msgList.signature.type = YHMessageType.fileSign.rawValue
                 callBackBlock(true, nil)
                 
             } else {
-                self.msgList = nil
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
                 callBackBlock(false, error)
             }
             
         } failBlock: { error in
-            self.msgList = nil
             callBackBlock(false, error)
         }
     }