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) { 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,