wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：查询单个商户时，不校验商户类型

This commit is contained in:
wuhui_zzw 2024-02-06 18:25:08 +08:00
parent 95f49fa8a1
commit 6fc66e83c2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/common/dao/system/merchant/MerchantDao.php
View File

@ -41,7 +41,11 @@ class MerchantDao extends BaseDao
$merchantType = in_array((int)$merchantType,[0,1,2]) ? $merchantType : 0;// 类型非法，使用默认类型
$query = Merchant::getDB()
->where('merchant_type', $merchantType)
->when(isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) {
$query->where('mer_id', $where['mer_id']);
},function($query) use ($merchantType){
$query->where('merchant_type', $merchantType);
})
->when($is_del !== null, function ($query) use ($is_del) {
$query->where('is_del', $is_del);
})
@ -75,9 +79,9 @@ class MerchantDao extends BaseDao
->when(isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) {
$query->where('mer_id', $where['mer_id']);
})
->when(isset($where['mer_id_list']) && $where['mer_id_list'] !== '', function ($query) use ($where) {
$query->whereIn('mer_id', $where['mer_id_list']);
})
// ->when(isset($where['mer_id_list']) && $where['mer_id_list'] !== '', function ($query) use ($where) {
// $query->whereIn('mer_id', $where['mer_id_list']);
// })
->when(isset($where['category_id']) && $where['category_id'] !== '', function ($query) use ($where) {
$query->whereIn('category_id', is_array($where['category_id']) ? $where['category_id'] : explode(',', $where['category_id']));
})