【供应商资源】供应商列表接口搜索调整

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/InviteVendorHistoryServiceImpl.java

@@ -149,7 +149,7 @@ public class InviteVendorHistoryServiceImpl implements InviteVendorHistoryServic
             // 给管理员发送站内信
             if (null != enterprise.getEnAdminuu()) {
                 User admin = userDao.findOne(enterprise.getEnAdminuu());
-                String content = "有客户查看您的信息，请尽快完善缺失的内容，以便获取更多商机";
+                String content = "有客户查看您的物料信息，请尽快完善缺失的内容，以便获取更多商机";
                 MessageModel model = new MessageModel();
                 model.setType(INVITATION_TYPE);
                 model.setProducerApp(PRODUCERAPP);

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/VendorIntroductionServiceImpl.java

@@ -132,7 +132,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		// 含名称、地址、、行业、经营范围搜索 物料型号、名称
 		if (!StringUtils.isEmpty(keyword)) {
 			String keywordSql = getKeywordSql(enUU, keyword);
-			enCountSql.append("select count(1) from (select count(1) from ").append(keywordSql);
+			enCountSql.append("select count(1) from (").append(keywordSql);
 		} else {
 			enCountSql.append("select count(1) from (select count(1) from (select * from sec$enterprises where en_name not like '%测试%' " +
 					" and lower(en_name) not like '%test%') en left join products on en.en_uu = pr_enuu where en_uu <> ").append(enUU);
@@ -148,10 +148,10 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 	 * @return
 	 */
 	private String getKeywordSql(Long enUU, String keyword) {
-		return "(select * from sec$enterprises where en_name not like '%测试%' and lower(en_name) not like '%test%' and (en_name like '%"
+		return "select en_uu,count(1) as counts from sec$enterprises left join products on pr_enuu = en_uu where en_name not like '%测试%' and lower(en_name) not like '%test%' and (en_name like '%"
 				+ keyword + "%' or en_address like '%" + keyword + "%' or en_tags like '%" + keyword + "%' or en_profession like '%" + keyword
-				+ "%')) en left join (select * from products where pr_cmpcode like '%" + keyword + "%' or pr_brand like '%" + keyword
-				+ "%') pr on en.en_uu = pr.pr_enuu where en_uu <> " + enUU;
+				+ "%' or pr_cmpcode like '%" + keyword + "%' or pr_brand like '%" + keyword
+				+ "%') and en_uu <> " + enUU;
 	}
 
 	/**
@@ -164,7 +164,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		StringBuilder enUUSql = new StringBuilder();
 		// 含名称、企业执照号、地址、邮箱、电话、行业、经营范围搜索
 		if (!StringUtils.isEmpty(keyword)) {
-			enUUSql.append("select en_uu, count(1) as counts from ").append(getKeywordSql(enUU, keyword));
+			enUUSql.append(getKeywordSql(enUU, keyword));
 		} else {
 			enUUSql.append("select en_uu, count(1) as counts from (select * from sec$enterprises where en_name not like '%测试%' " +
 					" and lower(en_name) not like '%test%') en left join products on en.en_uu = pr_enuu where en.en_uu <> ").append(enUU);