采购订单问题

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -116,7 +116,10 @@ public class PurOrderController {
         if (purOrderRequest.getStatus() == null) {
             purOrderRequest.setStatus(11);  //查询未审核和草稿状态
         }
-
+        String customerId = customerService.getCustomerId();
+        if (!customerId.equals("110")) {
+            purOrderRequest.setSupId(customerId);
+        }
         List<PurOrderResponse> purApplyEntities = purOrderService.queryPageList(purOrderRequest);
         PageInfo<PurOrderResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);
@@ -164,7 +167,6 @@ public class PurOrderController {
             Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
 
 
-
             if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true
                     && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) {
 
@@ -218,7 +220,6 @@ public class PurOrderController {
         }
 
 
-
         return ResultVOUtils.success("更新成功！");
     }
 

src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java

@@ -81,6 +81,7 @@ public class PurOrderRequest extends ListPageRequest {
     private Date auditTime;
 
     private String createUser;
+    private String supId;
 
     /**
      * 创建时间

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -40,12 +40,15 @@
                cb.employeeName     createUserName,
                ab.employeeName     auditUserName,
                auth_warehouse.NAME invName,
-               auth_dept.`name`    deptName
+               auth_dept.`name`    deptName,
+               basic_corp.name     supName
         FROM pur_order
                      LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
                      LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
                      LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
                      LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
+                     left join basic_corp on pur_order.supId = basic_corp.erpId
+
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}
@@ -92,6 +95,9 @@
             <if test="auditUser != '' and auditUser != null">
                 AND auditUser = #{auditUser}
             </if>
+            <if test="supId != null and supId != ''">
+                AND pur_order.supId = #{supId}
+            </if>
             <if test="createUser != '' and createUser != null">
                 AND createUser = #{createUser}
             </if>