1023

app/admin/controller/Activity.php

@@ -82,7 +82,7 @@ class Activity extends BaseController
         if ($good_name != "") {
             $where[] = ['a.good_name', "like", "%$good_name%"];
         }
-        $activity_code = isset($this->post['activity_code']) && $this->post['activity_code'] !=="" ? intval($this->post['activity_code']):"";
+        $activity_code = isset($this->post['activity_code']) && $this->post['activity_code'] !=="" ? trim($this->post['activity_code']):"";
         if($activity_code!==""){
             $where[]=['a.activity_code',"like","%$activity_code%"];
         }

app/admin/controller/Customar.php

@@ -205,6 +205,11 @@ class Customar extends BaseController
         if ($parent == "") {
             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();
+        if ($item!=false) {
+            return error_show(1002, "公司名称已存在");
+        }
         $customer_member = isset($this->post['customer_member']) && $this->post['customer_member'] !== "" ? $this->post['customer_member'] : "";
         if ($customer_member == "") {
             return error_show(1002, "参数customer_member不能为空");
@@ -313,6 +318,9 @@ class Customar extends BaseController
         if(empty($str)){
             return error_show(1002,"未找到数据");
         }
+        if($str['status']==1){
+            return error_show(1005,"启用状态,不允许删除");
+        }
         $end = Db::name('customer_info')->update(['id'=>$id,'is_del'=>1]);
         if($end){
             return error_show(0,"删除成功");

app/admin/controller/Customer.php

@@ -276,6 +276,10 @@ class Customer extends BaseController
         if($custy==false){
             return error_show(1004,"公司不存在");
         }
+        $db= Db::name('customer_org1')->where(['pid'=>$custy['id'],'','is_del'=>0])->count();
+        if($db>0){
+            return error_show(1004,"下一级有分公司,不允许删除");
+        }
         $custy['is_del']=1;
         $custy['updatetime']=date("Y-m-d H:i:s");
         $compy = Db::name('customer_org1')->save($custy);