|
@@ -1,5 +1,6 @@
|
|
package com.txz.mall.controller;
|
|
package com.txz.mall.controller;
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
import com.alibaba.fastjson.annotation.JSONField;
|
|
import com.alibaba.fastjson.annotation.JSONField;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
@@ -113,6 +114,9 @@ public class ProductController {
|
|
if (StringUtils.isNotBlank(dto.getStoreName())) {
|
|
if (StringUtils.isNotBlank(dto.getStoreName())) {
|
|
criteria.andLike("storeName", "%" + dto.getStoreName() + "%");
|
|
criteria.andLike("storeName", "%" + dto.getStoreName() + "%");
|
|
}
|
|
}
|
|
|
|
+ if (ObjectUtil.isNotNull(dto.getId())) {
|
|
|
|
+ criteria.andEqualTo("id", dto.getId());
|
|
|
|
+ }
|
|
if (StringUtils.isNotBlank(dto.getItemNumber())) {
|
|
if (StringUtils.isNotBlank(dto.getItemNumber())) {
|
|
criteria.andLike("itemNumber", "%" + dto.getItemNumber() + "%");
|
|
criteria.andLike("itemNumber", "%" + dto.getItemNumber() + "%");
|
|
}
|
|
}
|