Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java =================================================================== diff -u -r22892 -r22910 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java (.../SupplierManagerImpl.java) (revision 22892) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java (.../SupplierManagerImpl.java) (revision 22910) @@ -250,9 +250,11 @@ sql += " and po.rentTousse = '" + type + "'"; } //1.如果当前登录用户为外来器械供应商的申请人员时 - List supplierNameList = getSupplierNameListByTypeAndUserCode(Supplier.SUPPLIER_TYPE_RENTTOUSSE, AcegiHelper.getLoginUser().getUserName()); - if(CollectionUtils.isNotEmpty(supplierNameList)){ - sql += " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("companyName", supplierNameList); + if(StringUtils.equals(type, Supplier.SUPPLIER_TYPE_RENTTOUSSE)){ + List supplierNameList = getSupplierNameListByTypeAndUserCode(Supplier.SUPPLIER_TYPE_RENTTOUSSE, AcegiHelper.getLoginUser().getUserName()); + if(CollectionUtils.isNotEmpty(supplierNameList)){ + sql += " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("companyName", supplierNameList); + } } @SuppressWarnings("unchecked") List suppliers = objectDao.findBySql(Supplier.class.getSimpleName(), sql);