|
|
@@ -13,19 +13,21 @@ class GoodLogic extends BaseLogic
|
|
|
public static function list(array $data = []): Json
|
|
|
{
|
|
|
|
|
|
- $db = GoodModel::where('is_del', CommonModel::$del_normal);
|
|
|
+ $db = GoodModel::alias('a')
|
|
|
+ ->leftJoin('unit b', 'b.id=a.unit_id AND b.is_del=' . CommonModel::$del_normal)
|
|
|
+ ->where('a.is_del', CommonModel::$del_normal);
|
|
|
|
|
|
- if ($data['good_code'] !== '') $db->whereLike('good_code', '%' . $data['good_code'] . '%');
|
|
|
- if ($data['good_name']) $db->whereLike('good_name', '%' . $data['good_name'] . '%');
|
|
|
- if ($data['status'] != '') $db->where('status', $data['status']);
|
|
|
- if ($data['type'] != '') $db->where('type', $data['type']);
|
|
|
+ if ($data['good_code'] !== '') $db->whereLike('a.good_code', '%' . $data['good_code'] . '%');
|
|
|
+ if ($data['good_name']) $db->whereLike('a.good_name', '%' . $data['good_name'] . '%');
|
|
|
+ if ($data['status'] != '') $db->where('a.status', $data['status']);
|
|
|
+ if ($data['type'] != '') $db->where('a.type', $data['type']);
|
|
|
|
|
|
- $count = $db->count('id');
|
|
|
+ $count = $db->count('a.id');
|
|
|
|
|
|
$list = $db
|
|
|
- ->field('id,good_cover_img,good_code,good_name,status,type,creater,addtime')
|
|
|
+ ->field('a.id,a.good_cover_img,a.good_code,a.good_name,a.moq,a.step,b.unit,a.good_remark,a.type,a.status,a.creater,a.addtime')
|
|
|
->page($data['page'], $data['size'])
|
|
|
- ->order('addtime desc')
|
|
|
+ ->order('a.addtime desc')
|
|
|
->select()
|
|
|
->toArray();
|
|
|
|
