From bda98e774b72ba9e616e4cc274893ede4e2d5cff Mon Sep 17 00:00:00 2001
From: zzs <hi@vio.vin>
Date: Tue, 17 Dec 2024 15:31:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=B8=8B=E5=8D=95=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yem/or/api/AssepcDynamic.java    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yem/or/api/AssepcDynamic.java b/src/main/java/com/yem/or/api/AssepcDynamic.java
index f39faddb..e110142f 100644
--- a/src/main/java/com/yem/or/api/AssepcDynamic.java
+++ b/src/main/java/com/yem/or/api/AssepcDynamic.java
@@ -27,6 +27,7 @@ import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import javax.validation.constraints.NotBlank;
@@ -117,7 +118,9 @@ public class AssepcDynamic {
             JSONArray jsonArray = new JSONArray();
             QFilter qFilter = new QFilter("createorg.number", QCP.equals, "110");
             qFilter.and("status", QCP.equals, "C");
-            qFilter.and("yem_customer.number", QCP.equals, number);
+            if (!StringUtils.containsIgnoreCase(number, "admin")) {
+                qFilter.and("yem_customer.number", QCP.equals, number);
+            }
 //            qFilter.and("yem_billtype.number", QCP.equals, "yem_es_salesorder_ZJ");
             String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles", false);
             DynamicObjectCollection dynamicObjects = QueryServiceHelper.query("yem_em_devicefiles", selectfields
@@ -444,8 +447,10 @@ public class AssepcDynamic {
     @ApiPostMapping("/assepcdynamic/electronic_group")
     public CustomApiResult<Object> queryElectronicGroup(@NotNull @ApiParam("客户.编码(116021200012)") String number) {
         List<Map<String, Object>> result = new ArrayList<>();
-        QFilter qFilter = new QFilter("yem_customer.number", QCP.equals, number);
-        qFilter.and("status", QCP.equals, "C");
+        QFilter qFilter = new QFilter("status", QCP.equals, "C");
+        if (!StringUtils.containsIgnoreCase(number, "admin")) {
+            qFilter.and(new QFilter("yem_customer.number", QCP.equals, number));
+        }
         String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles");
         DynamicObjectCollection load = ORM.create().query("yem_em_devicefiles", selectfields + ",id", qFilter.toArray());
         for (DynamicObject dynamicObject : load) {
@@ -664,7 +669,9 @@ public class AssepcDynamic {
     public CustomApiResult<Object> queryBayedResourceNo(@NotBlank @ApiParam(value = "客户编码", example = "116021200012") String customerNo) {
         String algoKey = this.getClass().getName();
         QFilter qFilter = new QFilter("status", "=", "C");
-        qFilter.and("yem_customer.number", "=", customerNo);
+        if (!StringUtils.containsIgnoreCase(customerNo, "admin")) {
+            qFilter.and("yem_customer.number", "=", customerNo);
+        }
         qFilter.and("yem_model", "is not null", null);
         ArrayList<String> list = Lists.newArrayList();
         list.add("yem_model");
@@ -796,7 +803,9 @@ public class AssepcDynamic {
     public CustomApiResult<Object> queryProductModel(@NotBlank @ApiParam(value = "客户编码", example = "116021200012") String customerNo) {
         String algoKey = this.getClass().getName();
         QFilter qFilter = new QFilter("status", "=", "C");
-        qFilter.and("yem_customer.number", "=", customerNo);
+        if (!StringUtils.containsIgnoreCase(customerNo, "admin")) {
+            qFilter.and("yem_customer.number", "=", customerNo);
+        }
         qFilter.and("group", "is not null", null);
         ArrayList<String> list = Lists.newArrayList();
         list.add("group.number number");