Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -30,11 +30,6 @@ class ServersController extends BaseController
         }
         }
         $serversModel = new ServersModel();
         $serversModel = new ServersModel();
         $lists = $serversModel->list($this->map);
         $lists = $serversModel->list($this->map);
-        foreach ($lists as $k => $v){
-            if($v['being_number'] >= $v['total']){
-                unset($lists[$k]);
-            }
-        }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -38,9 +38,15 @@ class ServersIpController extends BaseController
             $this->response('當前服務器不存在',Code::SERVER_ERROR);
             $this->response('當前服務器不存在',Code::SERVER_ERROR);
         }
         }
         $serversIpModel = new ServersIpModel();
         $serversIpModel = new ServersIpModel();
-        $this->map['total'] = ['<',$info['ip_total']];
         $this->map['status'] = 0;
         $this->map['status'] = 0;
         $data = $serversIpModel->list($this->map);
         $data = $serversIpModel->list($this->map);
+        foreach ($data as $k => $v){
+            $v['is_optional'] = 0;//是否可选择
+            if($v['total'] >= $info['ip_total']){
+                $v['is_optional'] = 1;//不可选择
+            }
+            $data[$k] = $v;
+        }
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }