diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java index 31a1a4f2a..7220214c8 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java @@ -96,7 +96,7 @@ public class PlateController { @GetMapping("/webcad/page") @Operation(summary = "webcad获得板材信息分页") public CommonResult> webCadGetPlatePage(@Valid PlatePageReqVO pageReqVO) { - PageResult pageResult = plateService.getPlatePage(pageReqVO); + PageResult pageResult = plateService.webCadGetPlatePage(pageReqVO); return success(BeanUtils.toBean(pageResult, PlateRespVO.class)); } @@ -174,8 +174,8 @@ public class PlateController { @GetMapping("/webcad/all") @Operation(summary = "获取全部板材信息") - public CommonResult> webCadGetPlateAll(@RequestParam("organId") Long organId) { - List list = plateService.getPlateAll(organId); + public CommonResult> webCadGetPlateAll() { + List list = plateService.getPlateAll(); return success(BeanUtils.toBean(list, PlateRespVO.class)); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java index 7976aaa39..167b1d28c 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java @@ -67,6 +67,14 @@ public interface PlateService { */ PageResult getPlatePage(PlatePageReqVO pageReqVO); + /** + * webcad获取板材信息表 plate_{N}分页 + * + * @param pageReqVO 分页查询 + * @return 板材信息表 plate_{N}分页 + */ + PageResult webCadGetPlatePage(PlatePageReqVO pageReqVO); + /** * 批量导入板材 * @@ -89,5 +97,5 @@ public interface PlateService { } - List getPlateAll(Long organId); + List getPlateAll(); } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java index 69196fc16..b7151d488 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java @@ -130,6 +130,11 @@ public class PlateServiceImpl implements PlateService { return plateMapper.selectPage(pageReqVO); } + @Override + public PageResult webCadGetPlatePage(PlatePageReqVO pageReqVO) { + return plateMapper.selectPage(pageReqVO); + } + @Override @OrganIgnore @@ -183,9 +188,8 @@ public class PlateServiceImpl implements PlateService { } @Override - public List getPlateAll(Long organId) { - organId = getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), organId); - return plateMapper.getAllByOrganId( organId); + public List getPlateAll() { + return plateMapper.getAllByOrganId(OrganContextHolder.getOrganId()); } private void validateOrganExists(Long organId) {