|
@@ -9,6 +9,7 @@ import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.service.impl.RulePubServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
+import com.diagbot.util.IntegerUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.vo.RulePubIdVO;
|
|
@@ -31,7 +32,8 @@ public class RulePubFacade extends RulePubServiceImpl {
|
|
|
public IPage<RulePubDTO> pageRulePub(RulePubPageVO rulePubPageVO) {
|
|
|
IPage<RulePubDTO> res = new Page<>(rulePubPageVO.getCurrent(), rulePubPageVO.getSize());
|
|
|
QueryWrapper<RulePub> rulePubQueryWrapper = new QueryWrapper<>();
|
|
|
- rulePubQueryWrapper.like(StringUtil.isNotBlank(rulePubPageVO.getPubName()), "pub_name", rulePubPageVO.getPubName())
|
|
|
+ rulePubQueryWrapper.eq(!IntegerUtil.isNull(rulePubPageVO.getId()), "id", rulePubPageVO.getId())
|
|
|
+ .like(StringUtil.isNotBlank(rulePubPageVO.getPubName()), "pub_name", rulePubPageVO.getPubName())
|
|
|
.orderByDesc("id");
|
|
|
IPage<RulePub> page = this.page(rulePubPageVO, rulePubQueryWrapper);
|
|
|
BeanUtil.copyProperties(page, res);
|