From bd75cdeee8e7b0bbcad1f602cb31e9f1f2e35354 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 31 May 2023 11:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/controller/thrsys/ThrDeptController.java | 2 +-
 src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml    | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
index 760e55759..addf1bb3b 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
@@ -113,7 +113,7 @@ public class ThrDeptController {
         filterThrDeptRequest.setName(thrDeptEntity.getName());
         filterThrDeptRequest.setThirdSysFk(thrDeptEntity.getThirdSysFk());
         filterThrDeptRequest.setStatus(thrDeptEntity.getStatus());
-        if (!thrDeptService.editExit(thrDeptEntity.getCode(), thrDeptEntity.getCode(), thrDeptEntity.getId())) {
+        if (!thrDeptService.editExit(thrDeptEntity.getCode(), thrDeptEntity.getThirdSysFk(), thrDeptEntity.getId())) {
             thrDeptEntity.setPid(null); // 不能修改父级 pid
             thrDeptEntity.setUpdateTime(new Date());
             boolean b = thrDeptService.updateInvWarehouse(thrDeptEntity);
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
index 30f544330..43d5bc63d 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
@@ -84,9 +84,6 @@
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
             </if>
-            <if test="thirdSys != '' and thirdSys != null">
-                AND thirdSys = #{thirdSys}
-            </if>
             <if test="supName != '' and supName != null">
                 AND supName LIKE = #{supName}
             </if>