修正不能批量忽略。修正工单告警列表未知类型显示错误。

application/controllers/Warning.php

@@ -179,7 +179,7 @@ class Warning extends MY_Controller{
         $ids = explode(",",$warning_ids);
         foreach($ids as $key=>$val){
             if($val){
-                $warning_info = $this->warning_model->get_warning_with_id($val);
+                $warning_info = $this->warning_model->get_warning_with_objectid($val);
                 if($warning_info){
                     $warning_info['status'] = "20";
                     $this->warning_model->update_warning($warning_info);

application/controllers/Workorder.php

@@ -212,14 +212,16 @@ class Workorder extends MY_Controller
         $warning_level = "50";
         $branch_id = null;
         foreach ($ids as $key => $val) {
-            $warning = $this->warning_model->get_warning_with_objectid($val);
-            if ($warning) {
-                if (intval($warning['level']) <= intval($warning_level)) {
-                    $warning_level = $warning['level'];
-                    $workorder_name = $warning['warning_name'];
+            if($val) {
+                $warning = $this->warning_model->get_warning_with_objectid($val);
+                if ($warning) {
+                    if (intval($warning['level']) <= intval($warning_level)) {
+                        $warning_level = $warning['level'];
+                        $workorder_name = $warning['warning_name'];
+                    }
+                    $warning_list[] = $warning;
+                    $branch_id = $warning['branch']['branch_id'];
                 }
-                $warning_list[] = $warning;
-                $branch_id = $warning['branch']['branch_id'];
             }
         }
         $user_list = $this->user_model->select_users("2",$branch_id);

application/models/Warning_model.php

@@ -16,8 +16,10 @@ class Warning_model extends CI_Model {
     }
 
     public function get_warning_with_objectid($oid){
-	    $_id = $this->mongo_db->get_mongo_id($oid);
-        return $this->mongo_db->where(array("_id"=> $_id))->find_one($this->collection_name);
+	    if(!empty($oid)) {
+            $_id = $this->mongo_db->get_mongo_id($oid);
+            return $this->mongo_db->where(array("_id" => $_id))->find_one($this->collection_name);
+        }
     }
 
     public function select_warning($field,$warning_id){

application/views/templates/workorder/view.html

@@ -50,7 +50,7 @@
                             {foreach $workorder['warning_list'] as $k=>$val}
                             <tr>
                                 <td>{$val['warning_name']}</td>
-                                <td>{$warning_type[$val['type']]}</td>  <!--失陷事件、脆弱性、残余攻击-->
+                                <td>{if array_key_exists($val['type'],$warning_type)}<span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span>{else}未知类型{/if}</td>  <!--失陷事件、脆弱性、残余攻击-->
                                 <td>{$warning_level[$val['level']]}</td> <!--已失陷、高可疑、高危、中危、低危-->
                                 <td>{$val['create_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}</td>
                                 <td>{$val['content']}</td>