Merge branch 'test' into release

.gitattributes

@@ -2,4 +2,8 @@
 /webmain/model/loginModel.php merge=ours
 /webmain/webmainConfig.php merge=ours
 /.idea/ merge=ours
+<<<<<<< HEAD
 /images/OA二维码.png merge=ours
+=======
+/images/OA二维码.png merge=ours
+>>>>>>> 54d3127f87cdef7cc1f3ab124f081dbc0ee0c411

webmain/task/openapi/opencustomerAction.php

@@ -14,12 +14,20 @@ class opencustomerClassAction extends openapiAction
 
     //客户列表
     public function listAction(){
-        $post = $_POST;
-        $page = $post['size'] ?  $post['size']:0;
-        $page_size = $post['page_size']? $post['page_size']:10;
-        $sort =$post['sort']? $post['sort']: 'desc';
-        $sql  = 'select id,contract_number,name from [Q]customer as c  order by c.id '.$sort.' limit '.$page.','.$page_size;
+     $post = $_POST;
+        $email=$post['email'];
+        $sql  = "select u.id,u.email from oa_userinfo u where u.email = '$email'";
         $data = $this->db->getall($sql);
+        $uid=$data[0]['id'];//用户id
+        $data = $this->db->getall('select id,contract_number,name from 
+                                    oa_customer 
+                                    where (uid = ' . $uid . '
+                                        or department_id=(select deptname from oa_userinfo where id=' . $uid . ') 
+                                    or department_id like concat((select deptname from oa_userinfo where id=' . $uid . '),",%") 
+                                    or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . ')) 
+                                    or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . '),",%"))
+                                    and status = 1 
+                                    order by id desc');
         foreach ($data as $key => $vo){
             $supp ='select open_bank_name,bank_code,bank_holder,open_address from [Q]customer_bank_info   where mid='.$vo['id'];
             $contacts ='select name,job,tel,email,adress,remarks from [Q]contracts  where mid='.$vo['id'];

webmain/task/openapi/opensupplierAction.php

@@ -15,11 +15,17 @@ class opensupplierClassAction extends openapiAction
     //供应商列表
     public function listAction(){
         $post = $_POST;
-        $page = $post['size'] ?  $post['size']:0;
-        $page_size = $post['page_size']? $post['page_size']:10;
-        $sort =$post['sort']? $post['sort']: 'desc';
-        $sql  = 'select id,number,name from [Q]supplier as c  order by c.id '.$sort.' limit '.$page.','.$page_size;
+        $email=$post['email'];
+        $sql  = "select u.id,u.email from oa_userinfo u where u.email = '$email'";
         $data = $this->db->getall($sql);
+        $uid=$data[0]['id'];//用户id
+        $data = $this->db->getall('select id,number,name from oa_supplier where (uid = ' . $uid . '
+                or department_id=(select deptname from oa_userinfo where id=' . $uid . ') 
+                or department_id like concat((select deptname from oa_userinfo where id=' . $uid . '),",%") 
+                or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . ')) 
+                or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . '),",%"))
+                and status = 1 
+                order by id desc');
         foreach ($data as $key => $vo){
             $supp ='select open_bank_name,bank_code,bank_holder,open_address from [Q]supplier_bank_info   where mid='.$vo['id'];
             $contacts ='select name,job,tel,email,adress,remarks from [Q]supplier_contract   where mid='.$vo['id'];