diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/maininfo/AppMainInfoController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/maininfo/AppMainInfoController.java index dab8add..89bb695 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/maininfo/AppMainInfoController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/maininfo/AppMainInfoController.java @@ -60,7 +60,6 @@ public class AppMainInfoController { @GetMapping("/get") @Operation(summary = "获得工单信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('workorder:main-info:query')") public CommonResult getMainInfo(@RequestParam("id") Long id) { MainInfoDO mainInfo = mainInfoService.getMainInfo(id); @@ -101,7 +100,6 @@ public class AppMainInfoController { @GetMapping("/page") @Operation(summary = "获得工单信息分页") - @PreAuthorize("@ss.hasPermission('workorder:main-info:query')") public CommonResult> getMainInfoPage(@Valid AppMainInfoPageReqVO pageReqVO) { PageResult pageResult = mainInfoService.selectPageExcludeQuickOrder(pageReqVO); @@ -111,7 +109,6 @@ public class AppMainInfoController { @GetMapping("/export-excel") @Operation(summary = "导出工单信息 Excel") - @PreAuthorize("@ss.hasPermission('workorder:main-info:export')") @ApiAccessLog(operateType = EXPORT) public void exportMainInfoExcel(@Valid MainInfoPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java index dd8083a..78ac38e 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java @@ -148,6 +148,7 @@ public interface MainInfoMapper extends BaseMapperX { // 不查询快速工单 → 订单类型 != "Q" queryWrapper.ne(MainInfoDO::getOrderType, "Q"); queryWrapper.eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerCompanyId()) + .eqIfPresent(MainInfoDO::getCompanyId, reqVO.getCompanyId()) .likeIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo()) .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName()) .eqIfPresent(MainInfoDO::getStatus, reqVO.getStatus())