From 0f4d66fb45e090dbacbaa9e9af1e3e1dfbd70696 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 22 Oct 2025 17:56:21 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E8=BF=90=E8=BE=93=E7=AE=A1=E7=90=86=20-=E8=B4=A7=E7=89=A9?=
 =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1-=E6=9F=A5=E8=AF=A2=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E6=98=8E=E7=BB=86=E3=80=81=E6=9F=A5=E8=AF=A2=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8=E6=97=B6=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=89=B9=E6=AC=A1=E5=8F=B7=E4=B8=BA=E7=A9=BA=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../web/emis/EmisTmsSiteBatchDtlController.java   |  8 ++++++++
 .../emis/EmisTmsSiteBatchLoadingController.java   | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchDtlController.java
index 085aa0df3..7516e05dd 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchDtlController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchDtlController.java
@@ -12,10 +12,12 @@
 package com.xdadan.erp.web.emis;
 
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson.JSONObject;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -60,6 +62,12 @@ public class EmisTmsSiteBatchDtlController extends EmisBaseController
     public TableDataInfo list(EmisTmsSiteBatchDtl emisTmsSiteBatchDtl)
     {
         startPage();
+        if(Objects.isNull(emisTmsSiteBatchDtl)){
+            return new TableDataInfo();
+        }
+        if(StringUtil.isBlank(emisTmsSiteBatchDtl.getBatchNo())){
+            return new TableDataInfo();
+        }
 
         // 设置通用权限查询参数
 //        setPrivParams(emisTmsSiteBatchDtl);
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchLoadingController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchLoadingController.java
index 157a5d9cd..0b88ce13f 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchLoadingController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchLoadingController.java
@@ -1,18 +1,21 @@
 
-/** 
+/**
   * @Project: emis
   * @Title: EmisTmsSiteBatchLoadingController.java
   * @author linfso
   * @date 2024-03-01 06:38:50
   * @Copyright: ShangHai Duta 2022 All rights reserved.
-  * @version v1.0  
+  * @version v1.0
   * @Description: <p> 一级网点TMS组批次配置 控制器 </p>
  */
 
 package com.xdadan.erp.web.emis;
 
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
+
+import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,7 +40,7 @@ import com.xdadan.erp.emis.service.IEmisTmsSiteBatchLoadingService;
 
 /**
  * 一级网点TMS组批次配置Controller
- * 
+ *
  * @author linfso
  * @date 2024-03-01 06:38:50
  */
@@ -56,6 +59,12 @@ public class EmisTmsSiteBatchLoadingController extends EmisBaseController
     public TableDataInfo list(EmisTmsSiteBatchLoading emisTmsSiteBatchLoading)
     {
         startPage();
+        if(Objects.isNull(emisTmsSiteBatchLoading)){
+            return new TableDataInfo();
+        }
+        if(StringUtil.isBlank(emisTmsSiteBatchLoading.getBatchNo())){
+            return new TableDataInfo();
+        }
         List<EmisTmsSiteBatchLoading> list = emisTmsSiteBatchLoadingService.selectEmisTmsSiteBatchLoadingList(emisTmsSiteBatchLoading);
         return getDataTable(list);
     }