|
@@ -18,6 +18,7 @@
|
|
|
package com.qunzhixinxi.hnqz.admin.controller;
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -140,6 +141,14 @@ public class WmDaAgentController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ // 公司名称条件筛选
|
|
|
+ if (StrUtil.isNotBlank(wmDaAgent.getGsmc())) {
|
|
|
+ wmDaAgentList = wmDaAgentList.stream()
|
|
|
+ .filter(agent -> StrUtil.contains(agent.getGsmc(), wmDaAgent.getGsmc()))
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ }
|
|
|
+
|
|
|
//每页数据条数
|
|
|
Page<WmDaAgent> page1 = new Page<>();
|
|
|
int current = new Long(page.getCurrent()).intValue();
|