diff --git a/crmeb/app/model/order/StoreOrder.php b/crmeb/app/model/order/StoreOrder.php index 5003a88ff..5834b8399 100644 --- a/crmeb/app/model/order/StoreOrder.php +++ b/crmeb/app/model/order/StoreOrder.php @@ -596,6 +596,7 @@ class StoreOrder extends BaseModel */ public function searchIdsAttr($query, $value) { - if ($value !== '') $query->whereIn('id', $value); + if (is_string($value)) $value = explode(',', $value); + if (count($value)) $query->whereIn('id', $value); } } diff --git a/crmeb/app/model/product/product/StoreProduct.php b/crmeb/app/model/product/product/StoreProduct.php index ef2616a9d..432a59843 100644 --- a/crmeb/app/model/product/product/StoreProduct.php +++ b/crmeb/app/model/product/product/StoreProduct.php @@ -339,13 +339,14 @@ class StoreProduct extends BaseModel } /** - * 不在当前id中查询 + * 在当前id中查询 * @param $query * @param $value */ public function searchIdsAttr($query, $value) { - if ($value != '') $query->whereIn('id', $value); + if (is_string($value)) $value = explode(',', $value); + if (count($value)) $query->whereIn('id', $value); } /** diff --git a/crmeb/app/services/order/DeliveryServiceServices.php b/crmeb/app/services/order/DeliveryServiceServices.php index 99eca9903..1ad12c8aa 100644 --- a/crmeb/app/services/order/DeliveryServiceServices.php +++ b/crmeb/app/services/order/DeliveryServiceServices.php @@ -158,7 +158,7 @@ class DeliveryServiceServices extends BaseServices */ public function saveDeliveryService(array $data) { - if ($data['image'] == '') throw new AdminException(400466); + if ($data['image'] == '') throw new AdminException(400250); $data['uid'] = $data['image']['uid']; /** @var UserServices $userService */ $userService = app()->make(UserServices::class); diff --git a/crmeb/app/services/system/admin/SystemAdminServices.php b/crmeb/app/services/system/admin/SystemAdminServices.php index 8c3b4209e..7a13fac82 100644 --- a/crmeb/app/services/system/admin/SystemAdminServices.php +++ b/crmeb/app/services/system/admin/SystemAdminServices.php @@ -138,6 +138,7 @@ class SystemAdminServices extends BaseServices 'account' => $adminInfo->getData('account'), 'head_pic' => $adminInfo->getData('head_pic'), 'level' => $adminInfo->getData('level'), + 'real_name' => $adminInfo->getData('real_name'), ], 'logo' => sys_config('site_logo'), 'logo_square' => sys_config('site_logo_square'), diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json index 06a36e774..dc7587567 100644 --- a/template/uni-app/manifest.json +++ b/template/uni-app/manifest.json @@ -2,8 +2,8 @@ "name" : "CRMEB标准版", "appid" : "__UNI__A3F1ED4", "description" : "CRMEB标准版", - "versionName" : "4.6.0", - "versionCode" : 461, + "versionName" : "4.7.0", + "versionCode" : 470, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : {