Commit d2b4edbd authored by zw's avatar zw

Merge branch 'test'

# Conflicts: # application/api_broker/controller/Broker.php # application/index/controller/Member.php
parents 49025e55 17d40a66
...@@ -376,7 +376,7 @@ class Broker extends Basic ...@@ -376,7 +376,7 @@ class Broker extends Basic
if (true !== $checkResult) { if (true !== $checkResult) {
return $this->response("300", $checkResult); return $this->response("300", $checkResult);
} }
if ($params['agent_id'] !== $this->agentId) { if ($params['agent_id'] != $this->agentId) {
return $this->response("101", "失败!"); return $this->response("101", "失败!");
} }
...@@ -424,9 +424,6 @@ class Broker extends Basic ...@@ -424,9 +424,6 @@ class Broker extends Basic
if (true !== $checkResult) { if (true !== $checkResult) {
return $this->response("300", $checkResult); return $this->response("300", $checkResult);
} }
if ($params['agent_id'] !== $this->agentId) {
return $this->response("101", "失败!");
}
$user_id = $params['user_id']; $user_id = $params['user_id'];
......
...@@ -442,7 +442,7 @@ class Member extends Basic{ ...@@ -442,7 +442,7 @@ class Member extends Basic{
if(empty($params['content']) || empty($params['user_id'])) { if(empty($params['content']) || empty($params['user_id'])) {
return $this->response(101, $msg = '缺少参数', $params); return $this->response(101, $msg = '缺少参数', $params);
} }
if ($params['agent_id'] !== $this->userId) { if ($params['agent_id'] != $this->userId) {
return $this->response("101", "失败!"); return $this->response("101", "失败!");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment