|
@@ -77,9 +77,9 @@ class SyncMailToEs { |
|
@@ -77,9 +77,9 @@ class SyncMailToEs { |
|
77
|
$this->es->create($this->getData($this->data),$id);
|
77
|
$this->es->create($this->getData($this->data),$id);
|
|
78
|
}
|
78
|
}
|
|
79
|
else if($this->table == 'lists_auto'){
|
79
|
else if($this->table == 'lists_auto'){
|
|
80
|
- $id = db()->first(listsSql::first($this->data['list_id'],'`email_id`,`folder_id`,`uid`'));
|
|
|
|
81
|
- $id = $id['email_id'].'_'.$id['folder_id'].'_'.$id['uid'];
|
|
|
|
82
|
- $this->es->update($id,['is_auto'=>1]);
|
80
|
+ $data = db()->first(listsSql::first('`id` = '.$this->data['list_id']));
|
|
|
|
81
|
+ $id = $data['email_id'].'_'.$data['folder_id'].'_'.$data['uid'];
|
|
|
|
82
|
+ $this->es->update($id,$this->getData($data));
|
|
83
|
}
|
83
|
}
|
|
84
|
|
84
|
|
|
85
|
}
|
85
|
}
|
|
@@ -106,6 +106,10 @@ class SyncMailToEs { |
|
@@ -106,6 +106,10 @@ class SyncMailToEs { |
|
106
|
|
106
|
|
|
107
|
|
107
|
|
|
108
|
public function getData($data){
|
108
|
public function getData($data){
|
|
|
|
109
|
+ if(!empty($data['id'])){
|
|
|
|
110
|
+ $data['uuid'] = $data['id'];
|
|
|
|
111
|
+ unset($data['id']);
|
|
|
|
112
|
+ }
|
|
109
|
if(!empty($data['from'])){
|
113
|
if(!empty($data['from'])){
|
|
110
|
$data['from'] = [
|
114
|
$data['from'] = [
|
|
111
|
'email' => $data['from'],
|
115
|
'email' => $data['from'],
|
