From 4380fa2ea3403f5a0f1888a608551ab2f1e15a16 Mon Sep 17 00:00:00 2001 From: lcc <1127794702@qq.com> Date: Tue, 4 Jun 2024 10:52:31 +0800 Subject: [PATCH] 20240604 --- api/controllers/wxapp/licheb/Cusorder.php | 3 ++- api/controllers/wxapp/licheb/User.php | 4 ++-- common/models/auto/Auto_api_log_model.php | 9 +++++++++ common/models/biz/Biz_model.php | 3 --- 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 common/models/auto/Auto_api_log_model.php diff --git a/api/controllers/wxapp/licheb/Cusorder.php b/api/controllers/wxapp/licheb/Cusorder.php index 545bec48..4fc8cb5d 100644 --- a/api/controllers/wxapp/licheb/Cusorder.php +++ b/api/controllers/wxapp/licheb/Cusorder.php @@ -261,6 +261,8 @@ class Cusorder extends Wxapp $where['admin_id'] = $uid;//销售 } else if ($group_id == 2 || $group_id == 3) {//店长/老板 $where["(biz_id = {$this->biz_id} OR admin_id = {$uid})"] = null; + } else if ($group_id == 4) { + $where['biz_id'] = $this->biz_id; } $where['status<'] = 2; $d_count = $this->orders_model->count($where); @@ -327,7 +329,6 @@ class Cusorder extends Wxapp $where["(biz_id = {$this->biz_id} OR admin_id = {$uid})"] = null; } else if ($group_id == 4) { $where['biz_id'] = $this->biz_id; - $this->biz_id != 1 && $where['brand_id!='] = 3; //客户成功经理过滤 } if ($keyword) { $where['name'] = $keyword; diff --git a/api/controllers/wxapp/licheb/User.php b/api/controllers/wxapp/licheb/User.php index 45d574a9..2939f4af 100644 --- a/api/controllers/wxapp/licheb/User.php +++ b/api/controllers/wxapp/licheb/User.php @@ -480,7 +480,7 @@ class User extends Wxapp $province_id = $this->input_param('province_id'); $city_id = $this->input_param('city_id'); $lists = []; - + $o_where['status'] = 1; $biz_id_arr = explode(',', $this->session['biz_id']); $fileds = 'id,biz_name'; if ($this->session['biz_id'] && $biz_id_arr) { @@ -491,7 +491,7 @@ class User extends Wxapp !$province_id && $province_id = '430000'; $province_id && $o_where = ['province_id' => $province_id]; $city_id && $o_where = ['city_id' => $city_id]; - $bizs = $this->biz_model->select(['status' => 1], $o_where, 'id desc', '', '', $fileds); + $bizs = $this->biz_model->select($o_where, 'id desc', '', '', $fileds); } if ($bizs) { foreach ($bizs as $key => $val) { diff --git a/common/models/auto/Auto_api_log_model.php b/common/models/auto/Auto_api_log_model.php new file mode 100644 index 00000000..491f6c0a --- /dev/null +++ b/common/models/auto/Auto_api_log_model.php @@ -0,0 +1,9 @@ +table_name, 'default'); + } +} \ No newline at end of file diff --git a/common/models/biz/Biz_model.php b/common/models/biz/Biz_model.php index 05ff14b6..0668f521 100644 --- a/common/models/biz/Biz_model.php +++ b/common/models/biz/Biz_model.php @@ -46,11 +46,8 @@ class Biz_model extends HD_Model $bizs = []; $ids = implode(',', $ids_arr); if ($ids) { - $typeAry = $this->type_ary(); - $type_ids = implode(',',array_keys($typeAry)); $where = [ "id in ($ids)" => null, - "type in ($type_ids)" => null, "status" => 1 ]; is_array($o_where) && $where = array_merge($where, $o_where);