Merge branch 'master' of https://code.srdcloud.cn/a/fsdxszhpt/yzms into home

Change-Id: Idf181365e18064afe6f6a0d333fee39a5fc49f4a

backstage/application/backstage/controllers/Loginout.php

@@ -73,6 +73,11 @@ class Loginout extends CI_Controller
 		
         $adminInfo = $this->admin_model->get_admin_by_login($loginname, $password);
         if ($adminInfo) {
+            $status = $this->admin_model->get_company_status_by_companyId($adminInfo['company_id']);
+            if ($status['enabled'] != 1){
+                echo $this->lw_load->jsonResult(false, array('msg' => '该管理员关联的公司，【' . $status['company_name'] . '】公司已被停用！请联系电信管理员'));
+                exit;
+            }
 			$ip = $_SERVER["REMOTE_ADDR"];
 			/*if($adminInfo['company_id'] == 58) {
 				 if(!($ip >= '113.106.130.130' && $ip <= '113.106.130.134') && !strstr($ip, '61.142.240.')) {

backstage/application/backstage/controllers/Supplier.php

@@ -34,7 +34,7 @@ class Supplier extends CI_Controller {
     public function lists($page)
     {
         $this->load->library('lw_db',array('tb_name'=>'tb_dining_hall'),'tb_dining_hall');
-        $rowsSupplier = $this->tb_supplier->get_all('*',array('enabled'=>1));
+        $rowsSupplier = $this->tb_supplier->get_all('*',array('enabled'=>1,'company_id'=>$this->session->userdata("companyId")));
         $supplierHalls = array();
         foreach($rowsSupplier as $supplier){
             $rowsHall = $this->tb_dining_hall->get_all('*',array('supplier_id'=>$supplier['id']));

backstage/application/backstage/models/Admin_model.php

@@ -225,4 +225,12 @@ class Admin_model extends CI_Model {
 		return $this->session->userdata('topRole');
 	}
 
+    //获取公司状态
+    public function get_company_status_by_companyId($companyId)
+    {
+        $sql = "select * from tb_company where id = '{$companyId}'";
+
+        $row = $this->db->query($sql)->row_array();;
+        return $row? $row : null;
+    }
 }

backstage/application/backstage/views/admin/admin_edit.php

@@ -3,6 +3,12 @@ $adminInfo = isset($adminInfo)? $adminInfo : array();
 $hallList = isset($hallList)? $hallList : array();
 $roleList = isset($roleList)? $roleList : array();
 ?>
+<style>
+    .select2{
+        width: 100%!important;
+    }
+</style>
+
 <div class="modal-dialog modal-primary modal-lg">
     <div class="modal-content">
         <form id="submitForm">
@@ -126,6 +132,8 @@ $roleList = isset($roleList)? $roleList : array();
 </div>
 <script>
     $(function () {
+      $(".select2").select2({dropdownParent: $('#modalView')});
+
       var submitForm = $('#submitForm');
         var adminId = $("#admin-id").val();
         submitForm.validate({