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

house365-hgs-web/src/main/java/com/house365/web/controller/CustomerController.java

@@ -3042,7 +3042,6 @@ public class CustomerController extends BaseController {
             }
         }
 
-        System.out.println(getBackSeaTime(request, customerEntity));
 
         //查询回访记录
         cpMap.put("customerId", customerEntity.getId());
@@ -3224,8 +3223,22 @@ public class CustomerController extends BaseController {
         List<String> skPhones = new ArrayList<>();
         List<CustomerEntity> skkh = customer.getExistByPhone(phoneList, 3);
         List<CustomerEntity> skdhf = customer.getExistByPhone(phoneList, 2);
-        skPhones.addAll(skkh.stream().filter(i-> getBackSeaTime(request,i) < System.currentTimeMillis()).map(i-> i.getPhone()).collect(Collectors.toList()));
-        skPhones.addAll(skdhf.stream().filter(i-> getBackSeaTime(request,i) < System.currentTimeMillis()).map(i-> i.getPhone()).collect(Collectors.toList()));
+        for (int i = 0; i < skkh.size(); i++) {
+            if(getBackSeaTime(request,skkh.get(i)) > System.currentTimeMillis()) {
+                skPhones.add(skkh.get(i).getPhone());
+            } else if(!ghPhones.contains(skkh.get(i).getPhone())) {
+                ghPhones.add(skkh.get(i).getPhone());
+            }
+        }
+
+        for (int i = 0; i < skdhf.size(); i++) {
+            if(getBackSeaTime(request,skdhf.get(i)) > System.currentTimeMillis()) {
+                skPhones.add(skdhf.get(i).getPhone());
+            } else if(!ghPhones.contains(skdhf.get(i).getPhone())) {
+                ghPhones.add(skdhf.get(i).getPhone());
+            }
+        }
+
 //        skPhones.addAll(customer.getExistByPhone(phoneList,3));
         // 待回访
 //        skPhones.addAll(customer.getExistByPhone(phoneList,2));
@@ -3370,7 +3383,7 @@ public class CustomerController extends BaseController {
         boolean displayBackToSeaDate = false;
         Calendar backToSeaCal = Calendar.getInstance();
 
-        userEntity.setCity(cityCode);
+        userEntity.setCity(customerEntity.getCityCode());
 
 
         int visitCount = 0;