diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java index 6b1bc7c..307dd5a 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java +++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java @@ -269,7 +269,6 @@ public class ShopOrderController extends AbstractController { * @return */ @PostMapping(value = "/getShopOrderData") - public Object getShopOrderData(@RequestBody ShopOrderData indata) { Map map = new HashMap<>(); try { diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 4aeb7d1..595b2a2 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -3160,7 +3160,7 @@ A.sop_type as sopType, A.source_system as sourceSystem FROM file_management A - LEFT JOIN part_sop B ON A.SITE = B.SITE AND A.BU_NO = B.BU_NO AND A.FILE_NO = B.sop_no + LEFT JOIN part_sop B ON A.SITE = B.SITE AND A.BU_NO = B.BU_NO AND A.FILE_NO = B.sop_no and b.part_no = #{params.partNo} B.SITE IS NULL AND A.status_tb = 0 diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml index 64ec281..c5d56c8 100644 --- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml +++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml @@ -298,7 +298,7 @@ from Part as p,ShopOrder as T left join Project as pr on pr.Site=T.Site and pr.Projectid=T.ProjectID - AND T.Site=p.Site and T.PartNo=p.PartNo + AND T.Site = p.Site and T.PartNo = p.PartNo and T.site in (Select Site from AccessSite where upper(UserID)=#{query.user}) AND T.OrderType like #{query.orderType} @@ -365,8 +365,12 @@