Browse Source

1、 供应商过滤搜索时增加营业执照做过滤条件,处理因营业执照包含UU号字段造成的数据筛选错误;
2、 人员信息分配客户查询条件增加客户开关为开的限制;处理分配客户的数据与客户数据不一致的问题

hejq 8 years ago
parent
commit
05d509c42b

+ 2 - 0
src/main/java/com/uas/platform/b2b/controller/VendorController.java

@@ -54,6 +54,7 @@ public class VendorController {
 	public SPage<Vendor> getVendors(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getEnBussinessCode());
 		pageParams.getFilters().put("ve_vendswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
@@ -96,6 +97,7 @@ public class VendorController {
 	public SPage<Vendor> getCustomers(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("ve_vendenuu", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("ve_vendenuu", SystemSession.getUser().getEnterprise().getEnBussinessCode());
 		pageParams.getFilters().put("ve_custswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		SearchFilter filter = userService.distribute();

+ 2 - 1
src/main/java/com/uas/platform/b2b/dao/VendorDao.java

@@ -41,7 +41,8 @@ public interface VendorDao extends JpaSpecificationExecutor<Vendor>, GenericRepo
 
 	public List<Vendor> findByMyEnUU(Long myEnUU);
 
-	public List<Vendor> findByVendEnUU(Long vendUU);
+	@Query("from Vendor v where v.vendEnUU = :vendUU and v.custswitch = 1")
+	public List<Vendor> findByVendEnUU(@Param("vendUU") Long vendUU);
 
 	@Query("select v.myEnUU from Vendor v where v.vendEnUU = :vendEnUU")
 	public List<Long> findCustUUByVendEnUU(@Param("vendEnUU") long vendEnUU);