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 thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest); + ThrDeptEntity thrDeptEntity = thrDeptService.selectByCode(filterThrSubInvWarehouseRequest.getParentId(), filterThrSubInvWarehouseRequest.getThirdSysFk()); + + for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) { + thrInvWarehouseEntity.setParentName(thrDeptEntity.getName()); + } PageInfo pageInfo; pageInfo = new PageInfo<>(thrInvWarehouseEntities); PageSimpleResponse 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 @@