|
|
@@ -3,7 +3,6 @@ package com.fjhx.area.service.impl;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.area.entity.dto.AreaInfoSelectDto;
|
|
|
import com.fjhx.area.entity.po.CustomizeArea;
|
|
|
@@ -12,6 +11,8 @@ import com.fjhx.area.service.CustomizeAreaService;
|
|
|
import com.fjhx.area.service.SetCustomizeAreaId;
|
|
|
import com.fjhx.area.service.SetCustomizeAreaName;
|
|
|
import com.ruoyi.common.constant.BaseSourceConstant;
|
|
|
+import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
+import com.ruoyi.common.utils.wrapper.SqlField;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.HashSet;
|
|
|
@@ -85,6 +86,14 @@ public class CustomizeAreaServiceImpl extends ServiceImpl<CustomizeAreaMapper, C
|
|
|
item.setCityId(customizeArea.getId());
|
|
|
}
|
|
|
|
|
|
+ //如果省市id还是为空就赋值-1解决id没被修改问题
|
|
|
+ if (ObjectUtil.isEmpty(item.getCityId())){
|
|
|
+ item.setCityId(-1L);
|
|
|
+ }
|
|
|
+ if (ObjectUtil.isEmpty(item.getProvinceId())){
|
|
|
+ item.setProvinceId(-1L);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -148,7 +157,14 @@ public class CustomizeAreaServiceImpl extends ServiceImpl<CustomizeAreaMapper, C
|
|
|
@Override
|
|
|
public List<CustomizeArea> getList(AreaInfoSelectDto dto) {
|
|
|
String parentId = ObjectUtil.defaultIfNull(dto.getParentId(), "0");
|
|
|
- return list(Wrappers.<CustomizeArea>lambdaQuery().eq(CustomizeArea::getParentId, parentId));
|
|
|
+ IWrapper<CustomizeArea> wrapper = IWrapper.getWrapper();
|
|
|
+ wrapper.eq(CustomizeArea::getParentId, parentId);
|
|
|
+ wrapper.keyword(dto.getKeyword(),
|
|
|
+ new SqlField(CustomizeArea::getName),
|
|
|
+ new SqlField(CustomizeArea::getChineseName),
|
|
|
+ new SqlField(CustomizeArea::getCode)
|
|
|
+ );
|
|
|
+ return list(wrapper);
|
|
|
}
|
|
|
|
|
|
}
|
24282