From d7b1352a04212575a0e3d9d3fef38a86b74254bb Mon Sep 17 00:00:00 2001 From: zzs Date: Sat, 23 Nov 2024 14:11:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E8=BF=87=E7=9A=84=E6=95=B4=E6=9C=BA=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/yem/or/api/AssepcDynamic.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/yem/or/api/AssepcDynamic.java b/src/main/java/com/yem/or/api/AssepcDynamic.java index dfa56971..f39faddb 100644 --- a/src/main/java/com/yem/or/api/AssepcDynamic.java +++ b/src/main/java/com/yem/or/api/AssepcDynamic.java @@ -14,12 +14,14 @@ import com.yem.wm.utils.YEM; import com.yem.wm.utils.groupfunc.GroupTopOneFunction; import kd.bos.algo.DataSet; import kd.bos.algo.Row; +import kd.bos.context.RequestContext; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.openapi.common.custom.annotation.ApiController; import kd.bos.openapi.common.custom.annotation.ApiParam; import kd.bos.openapi.common.custom.annotation.ApiPostMapping; import kd.bos.openapi.common.result.CustomApiResult; +import kd.bos.openapi.service.context.ServiceApiContext; import kd.bos.orm.ORM; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; @@ -260,10 +262,16 @@ public class AssepcDynamic { @ApiPostMapping("/assepcdynamic/querymachine") public CustomApiResult querymachine(@NotNull @ApiParam("订单号") String salesorderno, @NotNull @ApiParam("资源号(编码)") String modelnumber) throws IOException { JSONObject object = new JSONObject(); + Map headers = ServiceApiContext.getRequest().getRequestHeaders(); try { JSONArray jsonArray = new JSONArray(); QFilter qFilters = new QFilter("yem_salesorderno", QCP.equals, salesorderno); qFilters.and(new QFilter("yem_model.number", QCP.equals, modelnumber)); + if (headers.containsKey("userid")) { + qFilters.and("yem_customer.number", "=", headers.get("userid")); + } + // test +// qFilters.and("yem_customer.number", "=", "116020700001"); DynamicObjectCollection yem_em_devicefiles = QueryServiceHelper.query("yem_em_devicefiles", "id,number,name,yem_framenumber,yem_enginecode,yem_enginemodel,yem_dateofmanufacture" , new QFilter[]{qFilters});