Commit ce0958f9 authored by 徐州's avatar 徐州

新增查询客户时,获取公海配置以客户城市为依据

parent 922a5b6e
...@@ -3184,10 +3184,10 @@ public class CustomerController extends BaseController { ...@@ -3184,10 +3184,10 @@ public class CustomerController extends BaseController {
if(TextUtils.isEmpty(mobilesStr)) { if(TextUtils.isEmpty(mobilesStr)) {
return getAutoUrl(); return getAutoUrl();
} }
model.addAttribute("mobiles", mobilesStr);
String[] mobiles = mobilesStr.split("\r\n"); String[] mobiles = mobilesStr.split("\r\n");
List<String> phoneList = Arrays.stream(mobiles).distinct().filter(i -> !TextUtils.isEmpty(i)).map(i->i.trim()).collect(Collectors.toList()); List<String> phoneList = Arrays.stream(mobiles).distinct().map(i->i.trim()).filter(i -> !TextUtils.isEmpty(i)).collect(Collectors.toList());
if(mobiles.length > 100) { if(mobiles.length > 100) {
addErrorMessage(model, "最多可搜索100个手机号"); addErrorMessage(model, "最多可搜索100个手机号");
...@@ -3308,7 +3308,6 @@ public class CustomerController extends BaseController { ...@@ -3308,7 +3308,6 @@ public class CustomerController extends BaseController {
} }
model.addAttribute("mobiles", mobilesStr);
model.addAttribute("dpSize",dpPhones == null ? 0 : dpPhones.size()); model.addAttribute("dpSize",dpPhones == null ? 0 : dpPhones.size());
model.addAttribute("skSize",skPhones == null ? 0 : skPhones.size()); model.addAttribute("skSize",skPhones == null ? 0 : skPhones.size());
model.addAttribute("ghSize",ghPhones == null ? 0 : ghPhones.size()); model.addAttribute("ghSize",ghPhones == null ? 0 : ghPhones.size());
......
...@@ -892,7 +892,7 @@ ...@@ -892,7 +892,7 @@
</select> </select>
<select id="getExistByPhone" parameterType="map" resultMap="infoMap"> <select id="getExistByPhone" parameterType="map" resultMap="infoMap">
SELECT * FROM customer where 1=1 SELECT * FROM customer where is_delete = 0
<if test="status != null and status != '' "> <if test="status != null and status != '' ">
AND status = #{status} AND status = #{status}
......
...@@ -870,7 +870,7 @@ ...@@ -870,7 +870,7 @@
</select> </select>
<select id="getExistByPhone" parameterType="map" resultMap="infoMap"> <select id="getExistByPhone" parameterType="map" resultMap="infoMap">
SELECT * FROM customer where 1=1 SELECT * FROM customer where is_delete = 0
<if test="status != null and status != '' "> <if test="status != null and status != '' ">
AND status = #{status} AND status = #{status}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment