Browse Source

合作伙伴根据营业执照号查询方法修改

wangmh 8 years ago
parent
commit
e00a4f96ed

+ 4 - 2
sso-server/src/main/java/com/uas/sso/service/impl/PartnershipServiceImpl.java

@@ -26,6 +26,8 @@ import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.base.Objects.equal;
+
 @Service
 public class PartnershipServiceImpl implements PartnershipService {
 
@@ -345,8 +347,8 @@ public class PartnershipServiceImpl implements PartnershipService {
 				}
 
 				// 精确查询条件
-				Predicate preVendBusinessCode = cb.equal(root.join("vendSpace", JoinType.INNER).get("businessCode").as(String.class), businessCode);
-				Predicate preCustBusinessCode = cb.equal(root.join("custSpace", JoinType.INNER).get("businessCode").as(String.class), businessCode);
+				Predicate preVendBusinessCode = cb.or(cb.equal(root.join("vendSpace", JoinType.LEFT).get("businessCode").as(String.class), businessCode), cb.equal(root.get("vendBusinessCode").as(String.class), businessCode));
+				Predicate preCustBusinessCode = cb.or(cb.equal(root.join("custSpace", JoinType.LEFT).get("businessCode").as(String.class), businessCode), cb.equal(root.get("custBusinessCode").as(String.class), businessCode));
 
 				// 关键词为空,只根据营业执照号查询
 				if (StringUtils.isEmpty(keyword)) {