Эх сурвалжийг харах

国家地址列表添加关键字搜索

ControlDream 1 жил өмнө
parent
commit
98d8973d96

+ 10 - 2
hx-area/src/main/java/com/fjhx/area/service/impl/CustomizeAreaServiceImpl.java

@@ -3,7 +3,6 @@ package com.fjhx.area.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.area.entity.dto.AreaInfoSelectDto;
 import com.fjhx.area.entity.dto.AreaInfoSelectDto;
 import com.fjhx.area.entity.po.CustomizeArea;
 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.SetCustomizeAreaId;
 import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.area.service.SetCustomizeAreaName;
 import com.ruoyi.common.constant.BaseSourceConstant;
 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 org.springframework.stereotype.Service;
 
 
 import java.util.HashSet;
 import java.util.HashSet;
@@ -148,7 +149,14 @@ public class CustomizeAreaServiceImpl extends ServiceImpl<CustomizeAreaMapper, C
     @Override
     @Override
     public List<CustomizeArea> getList(AreaInfoSelectDto dto) {
     public List<CustomizeArea> getList(AreaInfoSelectDto dto) {
         String parentId = ObjectUtil.defaultIfNull(dto.getParentId(), "0");
         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);
     }
     }
 
 
 }
 }