From 7b89981fa3367f7cf5d2fb32094e33b9a8bfd46b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 6 Feb 2023 15:05:00 +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

---
 .../api/controller/thrsys/ThrInvWarehouseController.java     | 5 +++++
 .../com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java    | 1 +
 src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml      | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java
index f990108e4..99498261a 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java
@@ -37,6 +37,11 @@ public class ThrInvWarehouseController {
     @GetMapping("/thirdSys/sub/inv/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
         List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
+        ThrDeptEntity thrDeptEntity = thrDeptService.selectByCode(filterThrSubInvWarehouseRequest.getParentId(), filterThrSubInvWarehouseRequest.getThirdSysFk());
+
+        for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
+            thrInvWarehouseEntity.setParentName(thrDeptEntity.getName());
+        }
         PageInfo<ThrInvWarehouseEntity> pageInfo;
         pageInfo = new PageInfo<>(thrInvWarehouseEntities);
         PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java
index d6971e3e7..1cdb56b07 100644
--- a/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java
+++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java
@@ -12,6 +12,7 @@ public class ThrInvWarehouseEntity {
     private String parentId;
     private String remark;
     private String thirdSysFk;
+    private String parentName;
 
 
 }
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml
index aeab337ff..71b93a108 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml
@@ -138,7 +138,7 @@
     <select id="selectByCode" resultType="com.glxp.api.entity.thrsys.ThrDeptEntity">
         select *
         from thr_dept
-        where code = #{code}
+        where code = #{code} and thirdSysFk = #{thirdSysFk}
     </select>
 
     <select id="selectMaxCode" resultType="com.glxp.api.entity.thrsys.ThrDeptEntity">