周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 5d2f78387cc069ea07c2fde61811cf46190dd906 2 个父辈 f7f6b8b9 3d78603d

合并分支 'lyh-server' 到 'master' 

Lyh server



查看合并请求 !3156
内嵌 并排对比
正在显示 2 个修改的文件 包含 3 行增加 和 3 行删除
@@ -53,7 +53,7 @@ class BaseController extends Controller @@ -53,7 +53,7 @@ class BaseController extends Controller
53 */ 53 */
54 public function handleIdAndProjectId() 54 public function handleIdAndProjectId()
55 { 55 {
56 - if(isset($this->param['id']) && !empty($this->param['id'])){ 56 + if(isset($this->param['id']) && !empty($this->param['id']) && !is_array($this->param['id'])){
57 if (preg_match('/^[A-Za-z]/', $this->param['id'])) { 57 if (preg_match('/^[A-Za-z]/', $this->param['id'])) {
58 $id = Cache::get('project_'.$this->param['id']); 58 $id = Cache::get('project_'.$this->param['id']);
59 if(empty($id)){ 59 if(empty($id)){
@@ -51,7 +51,7 @@ class BaseLogic extends Logic @@ -51,7 +51,7 @@ class BaseLogic extends Logic
51 */ 51 */
52 public function handleIdAndProjectId($param) 52 public function handleIdAndProjectId($param)
53 { 53 {
54 - if(isset($param['id']) && !empty($param['id'])){ 54 + if(isset($param['id']) && !empty($param['id']) && !is_array($param['id'])){
55 if (preg_match('/^[A-Za-z]/', $param['id'])) { 55 if (preg_match('/^[A-Za-z]/', $param['id'])) {
56 $id = Cache::get('project_'.$param['id']); 56 $id = Cache::get('project_'.$param['id']);
57 if(empty($id)){ 57 if(empty($id)){
@@ -64,7 +64,7 @@ class BaseLogic extends Logic @@ -64,7 +64,7 @@ class BaseLogic extends Logic
64 $param['id'] = $id; 64 $param['id'] = $id;
65 } 65 }
66 } 66 }
67 - if(isset($param['project_id']) && !empty($param['project_id'])){ 67 + if(isset($param['project_id']) && !empty($param['project_id']) && !is_array($param['project_id'])){
68 if (preg_match('/^[A-Za-z]/', $param['project_id'])) { 68 if (preg_match('/^[A-Za-z]/', $param['project_id'])) {
69 $id = Cache::get('project_'.$param['project_id']); 69 $id = Cache::get('project_'.$param['project_id']);
70 if(empty($id)){ 70 if(empty($id)){