diff --git a/Server/application/api/controller/WechatChatroomController.php b/Server/application/api/controller/WechatChatroomController.php index b3484d44..bba85b58 100644 --- a/Server/application/api/controller/WechatChatroomController.php +++ b/Server/application/api/controller/WechatChatroomController.php @@ -57,13 +57,17 @@ class WechatChatroomController extends BaseController // 保存数据到数据库 if (!empty($response['results'])) { + $isUpdate = false; foreach ($response['results'] as $item) { - $this->saveChatroom($item); + $updated = $this->saveChatroom($item); + if($updated && $isDel == 0){ + $isUpdate = true; + } } } if($isJob){ - return json_encode(['code'=>200,'msg'=>'success','data'=>$response]); + return json_encode(['code'=>200,'msg'=>'success','data'=>$response,'isUpdate'=>$isUpdate]); }else{ return successJson($response); } @@ -111,8 +115,10 @@ class WechatChatroomController extends BaseController if ($chatroom) { $chatroom->save($data); + return true; } else { WechatChatroomModel::create($data); + return false; } // // 同时保存群成员数据 diff --git a/Server/application/api/controller/WechatFriendController.php b/Server/application/api/controller/WechatFriendController.php index ae070fa3..d0527497 100644 --- a/Server/application/api/controller/WechatFriendController.php +++ b/Server/application/api/controller/WechatFriendController.php @@ -34,9 +34,9 @@ class WechatFriendController extends BaseController // 根据isDel设置对应的isDeleted值 $isDeleted = null; // 默认值 - if ($isDel === '0' || $isDel === 0) { + if ($isDel == '0' || $isDel == 0) { $isDeleted = false; - } elseif ($isDel === '1' || $isDel === 1) { + } elseif ($isDel == '1' || $isDel == 1) { $isDeleted = true; } @@ -73,7 +73,7 @@ class WechatFriendController extends BaseController $isUpdate = false; foreach ($response as $item) { $updated = $this->saveFriend($item); - if($updated){ + if($updated && $isDel == 0){ $isUpdate = true; } } @@ -146,10 +146,10 @@ class WechatFriendController extends BaseController if ($friend) { $result = $friend->save($data); - return false; + return true; } else { WechatFriendModel::create($data); - return true; + return false; } } } \ No newline at end of file