git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@214 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/dao/PurchaseOrderReplyDao.java

@@ -20,14 +20,16 @@ public interface PurchaseOrderReplyDao extends JpaSpecificationExecutor<Purchase
 	 * @param orderItemId
 	 * @return
 	 */
-	@Query("from PurchaseReply r where r.orderItem.id = :orderItemId")
+	@Query("from PurchaseOrderReply r where r.orderItem.id = :orderItemId")
 	public List<PurchaseOrderReply> findByOrderItemId(@Param("orderItemId") long orderItemId);
 
 	/**
 	 * 按回复记录的状态查找回复记录
 	 * 
+	 * @param enUU
 	 * @param status
 	 * @return
 	 */
-	public List<PurchaseOrderReply> findByStatus(short status);
+	@Query("from PurchaseOrderReply r where r.orderItem.order.enUU = :enUU and r.status = :status")
+	public List<PurchaseOrderReply> findByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") short status);
 }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -23,6 +23,7 @@ import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.model.PurchaseOrderReply;
 import com.uas.platform.b2b.service.PurchaseOrderService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.exception.NotFoundException;
 import com.uas.platform.core.model.PageInfo;
@@ -133,7 +134,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public List<PurchaseOrderReply> findNotUploadReply() {
-		return purchaseOrderReplyDao.findByStatus((short) Status.NOT_UPLOAD.value());
+		return purchaseOrderReplyDao.findByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(), (short) Status.NOT_UPLOAD.value());
 	}
 
 }