工艺管理产品下拉框修改

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MachiningProductController.java

@@ -109,8 +109,8 @@ public class MachiningProductController {
 
         params.setCompanyId(currentUser.getCompanyId());
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        //List<MachiningProduct> list = machiningProductService.findProductList(params);
-        List<MachiningProductVo> list = machiningProductService.findProductListBom(params);
+        List<MachiningProduct> list = machiningProductService.findProductList(params);
+        //List<MachiningProductVo> list = machiningProductService.findProductListBom(params);
 
         PageInfo pageInfo = new PageInfo(list);
         return ResultGenerator.genSuccessResult(pageInfo);
@@ -119,11 +119,11 @@ public class MachiningProductController {
     //获取已生成对应bom的所有产品
     @GetMapping("/productHaveBomList")
     public Result productHaveBomList(MachiningProductParams params, @ApiIgnore @User CurrentUser currentUser) {
-        //if(currentUser==null){
-        //    return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
-        //}
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
 
-        params.setCompanyId(1);
+        params.setCompanyId(currentUser.getCompanyId());
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         List<MachiningProductHaveBom> list = machiningProductService.findProductHaveBomList(params);
         PageInfo pageInfo = new PageInfo(list);