Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Customar.php

@@ -206,7 +206,7 @@ class Customar extends BaseController
             return error_show(1002, "参数parent不能为空");
         }
         $rename = Db::name('customer_org1')->where(['is_del' =>0,'id'=>$parent])->find();
-        $item = Db::name('customer_info')->where(['itemid'=>$rename['id'],'companyName'=>$companyName,'is_del'=>0])->find();
+        $item = Db::name('customer_info')->where(['itemid'=>$rename['id'],'companyName'=>$companyName,'is_del'=>0])->where([['id','<>',$id]])->find();
         if ($item!=false) {
             return error_show(1002, "公司名称已存在");
         }

app/admin/controller/Customer.php

@@ -135,10 +135,6 @@ class Customer extends BaseController
         if ($name == "") {
             return error_show(1003, "公司名称不能为空");
         }
-        $rename = Db::name('customer_org1')->where(['is_del' => 0, 'name' => $name])->find();
-        if (!empty($rename)) {
-            return error_show(1002, "组织名称已存在");
-        }
         $weight = isset($this->post['weight']) && $this->post['weight'] !== "" ? trim($this->post['weight']) : "0";
         $pid = isset($this->post['pid']) && $this->post['pid'] !== "" ? trim($this->post['pid']) : "0";
 //        if ($pid === "") {
@@ -151,6 +147,10 @@ class Customer extends BaseController
                 return error_show(1004,"父级不能为空");
             }
         }
+        $rename = Db::name('customer_org1')->where(['is_del' => 0, 'name' => $name,'pid'=>$pid])->find();
+        if (!empty($rename)) {
+            return error_show(1002, "组织名称已存在");
+        }
         $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
         if($token==''){
             return error_show(1005,"参数token不能为空");
@@ -229,6 +229,7 @@ class Customer extends BaseController
             return error_show(1004,"父级不能为空");
         }
         }
+
         $weight = isset($this->post['weight']) && $this->post['weight'] !==""? intval($this->post['weight']):"0";
 
 //      $level = isset($this->post['level']) && $this->post['level'] !==""? intval($this->post['level']):"";
@@ -236,7 +237,7 @@ class Customer extends BaseController
         if($name==""){
             return error_show(1004,"公司名称不能为空");
         }
-        $repeat_name = Db::name('customer_org1')->where(["is_del"=>0,"name"=>$name])->where("id","<>","$id")->find();
+        $repeat_name = Db::name('customer_org1')->where(["is_del"=>0,"name"=>$name,'pid'=>$pid])->where("id","<>","$id")->find();
         // echo Db::name('customer_org1')->getLastSql();
         if(!empty($repeat_name)){
             return error_show(1004,"部门名称已存在");
@@ -276,9 +277,14 @@ class Customer extends BaseController
         if($custy==false){
             return error_show(1004,"公司不存在");
         }
+        //$var= Db::name('customer_info')->where(['itemid'=>$id,'is_del'=>0])->find();
         $db= Db::name('customer_org1')->where(['pid'=>$custy['id'],'is_del'=>0])->count();
         if($db>0){
-            return error_show(1004,"下一级有分公司,不允许删除");
+            return error_show(1004,"下一级还有组织,不允许删除");
+        }
+        $var= Db::name('customer_info')->where(['itemid'=>$id,'is_del'=>0])->count();
+        if($var>0){
+            return error_show(1004,"下一级还有分公司,不允许删除");
         }
         $custy['is_del']=1;
         $custy['updatetime']=date("Y-m-d H:i:s");