|
|
@@ -1,27 +1,28 @@
|
|
|
package org.dromara.system.service.impl;
|
|
|
|
|
|
-import cn.hutool.core.bean.BeanUtil;
|
|
|
-import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import org.dromara.common.core.utils.MapstructUtils;
|
|
|
-import org.dromara.common.core.utils.StringUtils;
|
|
|
-import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
-import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
+import org.dromara.common.core.utils.MapstructUtils;
|
|
|
+import org.dromara.common.core.utils.StringUtils;
|
|
|
+import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
+import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
+import org.dromara.system.domain.AddressArea;
|
|
|
import org.dromara.system.domain.bo.AddressAreaBo;
|
|
|
import org.dromara.system.domain.vo.AddressAreaVo;
|
|
|
-import org.dromara.system.domain.AddressArea;
|
|
|
import org.dromara.system.mapper.AddressAreaMapper;
|
|
|
import org.dromara.system.service.IAddressAreaService;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Collection;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -77,7 +78,9 @@ public class AddressAreaServiceImpl extends ServiceImpl<AddressAreaMapper, Addre
|
|
|
private LambdaQueryWrapper<AddressArea> buildQueryWrapper(AddressAreaBo bo) {
|
|
|
Map<String, Object> params = bo.getParams();
|
|
|
LambdaQueryWrapper<AddressArea> lqw = Wrappers.lambdaQuery();
|
|
|
- lqw.eq(AddressArea::getLevel, bo.getLevel());
|
|
|
+ lqw.eq(bo.getLevel() != null, AddressArea::getLevel, bo.getLevel());
|
|
|
+ lqw.like(StringUtils.isNotBlank(bo.getAreaName()), AddressArea::getAreaName, bo.getAreaName());
|
|
|
+
|
|
|
lqw.orderByAsc(AddressArea::getId);
|
|
|
return lqw;
|
|
|
}
|