From 064e77974728754410d13054065b365a23fb8c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 24 Apr 2023 11:55:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
index 2d1c59dee..23c78b865 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
@@ -41,6 +41,7 @@
     SELECT
     pur_order_detail.*,
     basic_products.ggxh spec,
+    basic_products.nameCode nameCode,
     basic_products.measname,
     basic_products.manufactory,
     basic_products.ylqxzcrbarmc,

From d4fa6da5af743fb8b1c751a9c8e815865b1401f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 24 Apr 2023 15:38:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E9=97=A8bug=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/controller/auth/DeptController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java
index 644c69e20..b929426bb 100644
--- a/src/main/java/com/glxp/api/controller/auth/DeptController.java
+++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java
@@ -196,7 +196,7 @@ public class DeptController {
         } else {
             //子级部门
             FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
-            filterInvWarehouseRequest.setPid(deptEntity.getPid());
+//            filterInvWarehouseRequest.setPid(deptEntity.getPid());
             DeptEntity codeEntity = deptService.selectMaxCode(filterInvWarehouseRequest);
             DeptEntity pEntity = deptService.selectById(deptEntity.getPid() + "");
             if (codeEntity == null) {