Merge remote-tracking branch 'origin/master'

2 years ago · b6032d25b8
parent dc8c63a14b d4fa6da5af
commit b6032d25b8
2 changed files with 2 additions and 1 deletions
--- 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) {
--- 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,