|
@@ -412,13 +412,13 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
|
|
|
|
|
|
@Override
|
|
|
public List<Object> companyScatterer(String streetTown, String companyType) {
|
|
|
- List<String> companyTypeList = new ArrayList<>();
|
|
|
- if (StringUtils.isNotBlank(companyType)) {
|
|
|
- String[] companyTypeList1 = companyType.split(",");
|
|
|
- for (int i = 0; i < companyTypeList1.length; i++) {
|
|
|
- companyTypeList.add(companyTypeList1[i]);
|
|
|
- }
|
|
|
- }
|
|
|
+// List<String> companyTypeList = new ArrayList<>();
|
|
|
+// if (StringUtils.isNotBlank(companyType)) {
|
|
|
+// String[] companyTypeList1 = companyType.split(",");
|
|
|
+// for (int i = 0; i < companyTypeList1.length; i++) {
|
|
|
+// companyTypeList.add(companyTypeList1[i]);
|
|
|
+// }
|
|
|
+// }
|
|
|
List<String> streetTownList = new ArrayList<>();
|
|
|
streetTownList.add("华漕镇");
|
|
|
streetTownList.add("新虹街道");
|
|
@@ -439,7 +439,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
|
|
|
BaseCompany::getCompanyType, BaseCompany::getLinkPhone, BaseCompany::getAddress, BaseCompany::getStreetTown)
|
|
|
.eq(BaseCompany::getEnable, 0)
|
|
|
.eq(StringUtils.isNotBlank(streetTown), BaseCompany::getStreetTown, streetTown)
|
|
|
- .in(CollectionUtils.isNotEmpty(companyTypeList), BaseCompany::getCompanyType, companyTypeList);
|
|
|
+ .eq(StringUtils.isNotBlank(companyType), BaseCompany::getCompanyType, companyType);
|
|
|
List<BaseCompany> list1 = this.list(queryWrapper);
|
|
|
if (CollectionUtils.isNotEmpty(list1)) {
|
|
|
List<String> companyIdList = new ArrayList<>();
|