|
|
@@ -86,7 +86,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
|
|
|
productCondition = "pr_pbranden = '" + keyword + "'";
|
|
|
break;
|
|
|
default :
|
|
|
- enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '% "
|
|
|
+ enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '%"
|
|
|
+ keyword + "%')";
|
|
|
break;
|
|
|
}
|
|
|
@@ -240,8 +240,11 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
|
|
|
enCountSql.append("select count(1) from (select distinct(en_uu) from (select en_uu from sec$enterprises where en_name not like '%测试%' " +
|
|
|
" and en_name not like '%test%' and (length(en_businesscode) > 12 or en_name like '%香港%' or en_name like '%HONG KONG%' " +
|
|
|
" or en_area like '%香港%')and (en_name not REGEXP '^[0-9]*$' and (en_name like '%ltd%' or en_name like '%limited%' or " +
|
|
|
- " en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]') ) and en_uu <> ")
|
|
|
- .append(enUU).append(") e ");
|
|
|
+ " en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]') ) and ");
|
|
|
+ if (StringUtils.isEmpty(productCondition)) {
|
|
|
+ enCountSql.append(enterpriseCondition).append(" and ");
|
|
|
+ }
|
|
|
+ enCountSql.append(" en_uu <> ").append(enUU).append(") e ");
|
|
|
if (!StringUtils.isEmpty(productCondition)) {
|
|
|
enCountSql.append("right join ( select pr_enuu from products where ").append(productCondition).append(") p on pr_enuu = en_uu");
|
|
|
enCountSql.append(" union select en_uu from sec$enterprises where en_name not like '%测试%' and en_name not like '%test%' and (length(en_businesscode) > 12 or en_name like '%香港%' or en_name like '%HONG KONG%' or en_area like '%香港%')and (en_name not REGEXP '^[0-9]*$' and (en_name like '%ltd%' or en_name like '%limited%' or en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]') and ")
|
yangc