From c81b9150ce44a07eda46e7a862e3f607568b669a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 22 Oct 2025 10:22:04 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-22=20=E5=9B=BA=E5=AE=9A=E8=BD=BD?=
 =?UTF-8?q?=E5=85=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FixedCarrierController.java    | 20 ++++++++---------
 .../fixedCarrier/entity/FixedCarrier.java     |  9 ++++++++
 .../fixedCarrier/FixedCarrierMapper.xml       | 22 +++++++++----------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/fixedCarrier/controller/FixedCarrierController.java b/src/main/java/com/gaotao/modules/fixedCarrier/controller/FixedCarrierController.java
index 775f3a5..99e3e46 100644
--- a/src/main/java/com/gaotao/modules/fixedCarrier/controller/FixedCarrierController.java
+++ b/src/main/java/com/gaotao/modules/fixedCarrier/controller/FixedCarrierController.java
@@ -95,11 +95,11 @@ public class FixedCarrierController extends AbstractController {
     public R save(@RequestBody FixedCarrier fixedCarrier) {
         try {
             // 参数校验
-            if (fixedCarrier.getSite() == null || fixedCarrier.getSite().isEmpty()) {
-                return R.error("站点不能为空");
-            }
-            if (fixedCarrier.getBuNo() == null || fixedCarrier.getBuNo().isEmpty()) {
-                return R.error("BU不能为空");
+            if (fixedCarrier.getBu().split("_").length >= 2 ) {
+                fixedCarrier.setSite(fixedCarrier.getBu().split("_")[0]);
+                fixedCarrier.setBuNo(fixedCarrier.getBu().split("_")[1]);
+            } else {
+                return R.error("工厂和部门有误!");
             }
             if (fixedCarrier.getCarrierNo() == null || fixedCarrier.getCarrierNo().isEmpty()) {
                 return R.error("载具编码不能为空");
@@ -137,11 +137,11 @@ public class FixedCarrierController extends AbstractController {
     public R update(@RequestBody FixedCarrier fixedCarrier) {
         try {
             // 参数校验
-            if (fixedCarrier.getSite() == null || fixedCarrier.getSite().isEmpty()) {
-                return R.error("站点不能为空");
-            }
-            if (fixedCarrier.getBuNo() == null || fixedCarrier.getBuNo().isEmpty()) {
-                return R.error("BU不能为空");
+            if (fixedCarrier.getBu().split("_").length >= 2 ) {
+                fixedCarrier.setSite(fixedCarrier.getBu().split("_")[0]);
+                fixedCarrier.setBuNo(fixedCarrier.getBu().split("_")[1]);
+            } else {
+                return R.error("工厂和部门有误!");
             }
             if (fixedCarrier.getCarrierNo() == null || fixedCarrier.getCarrierNo().isEmpty()) {
                 return R.error("载具编码不能为空");
diff --git a/src/main/java/com/gaotao/modules/fixedCarrier/entity/FixedCarrier.java b/src/main/java/com/gaotao/modules/fixedCarrier/entity/FixedCarrier.java
index 860c046..c28902d 100644
--- a/src/main/java/com/gaotao/modules/fixedCarrier/entity/FixedCarrier.java
+++ b/src/main/java/com/gaotao/modules/fixedCarrier/entity/FixedCarrier.java
@@ -11,6 +11,7 @@ import java.util.Date;
  * 对应数据库表：fixed_carrier
  */
 public class FixedCarrier {
+    private String bu;
     /**
      * 站点
      */
@@ -112,6 +113,14 @@ public class FixedCarrier {
      */
     private String remark;
 
+    public String getBu() {
+        return bu;
+    }
+
+    public void setBu(String bu) {
+        this.bu = bu;
+    }
+
     public String getSite() {
         return site;
     }
diff --git a/src/main/resources/mapper/fixedCarrier/FixedCarrierMapper.xml b/src/main/resources/mapper/fixedCarrier/FixedCarrierMapper.xml
index 1799496..d3824ab 100644
--- a/src/main/resources/mapper/fixedCarrier/FixedCarrierMapper.xml
+++ b/src/main/resources/mapper/fixedCarrier/FixedCarrierMapper.xml
@@ -49,12 +49,11 @@
             create_date AS createDate,
             remark
         FROM fixed_carrier
-        WHERE 1=1
-        <if test="site != null and site != ''">
-            AND site = #{site}
-        </if>
-        <if test="buNo != null and buNo != ''">
-            AND bu_no = #{buNo}
+        WHERE
+        site in (select site from AccessSite where userID = #{userName})
+        and bu_no in (select bu_no from AccessBu where username = #{userName})
+        <if test="buDesc != null and buDesc != ''">
+            AND dbo.get_bu_desc (site, bu_no) = #{buDesc}
         </if>
         <if test="carrierNo != null and carrierNo != ''">
             AND carrier_no LIKE '%' + #{carrierNo} + '%'
@@ -170,12 +169,11 @@
     <select id="queryTotal" resultType="int">
         SELECT COUNT(*)
         FROM fixed_carrier
-        WHERE 1=1
-        <if test="site != null and site != ''">
-            AND site = #{site}
-        </if>
-        <if test="buNo != null and buNo != ''">
-            AND bu_no = #{buNo}
+        WHERE
+        site in (select site from AccessSite where userID = #{userName})
+        and bu_no in (select bu_no from AccessBu where username = #{userName})
+        <if test="buDesc != null and buDesc != ''">
+            AND dbo.get_bu_desc (site, bu_no) = #{buDesc}
         </if>
         <if test="carrierNo != null and carrierNo != ''">
             AND carrier_no LIKE '%' + #{carrierNo} + '%'