BJ_FS / urbanops

Commit 5f6ad90cd1b3832342fccb086ca00c9e350860ec

Authored by 王彪总
2 parents 2f8e06bd e8a01f8e

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 2 changed files with 1 additions and 3 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/maininfo/AppMainInfoController.java
  View file @5f6ad90
@@ -60,7 +60,6 @@ public class AppMainInfoController { @@ -60,7 +60,6 @@ public class AppMainInfoController {
60 @GetMapping("/get") 60 @GetMapping("/get")
61 @Operation(summary = "获得工单信息") 61 @Operation(summary = "获得工单信息")
62 @Parameter(name = "id", description = "编号", required = true, example = "1024") 62 @Parameter(name = "id", description = "编号", required = true, example = "1024")
63 - @PreAuthorize("@ss.hasPermission('workorder:main-info:query')")  
64 public CommonResult<AdminMainInfoRespVO> getMainInfo(@RequestParam("id") Long id) { 63 public CommonResult<AdminMainInfoRespVO> getMainInfo(@RequestParam("id") Long id) {
65 MainInfoDO mainInfo = mainInfoService.getMainInfo(id); 64 MainInfoDO mainInfo = mainInfoService.getMainInfo(id);
66 65
@@ -101,7 +100,6 @@ public class AppMainInfoController { @@ -101,7 +100,6 @@ public class AppMainInfoController {
101 100
102 @GetMapping("/page") 101 @GetMapping("/page")
103 @Operation(summary = "获得工单信息分页") 102 @Operation(summary = "获得工单信息分页")
104 - @PreAuthorize("@ss.hasPermission('workorder:main-info:query')")  
105 public CommonResult<PageResult<AdminMainInfoRespVO>> getMainInfoPage(@Valid AppMainInfoPageReqVO pageReqVO) { 103 public CommonResult<PageResult<AdminMainInfoRespVO>> getMainInfoPage(@Valid AppMainInfoPageReqVO pageReqVO) {
106 104
107 PageResult<MainInfoDO> pageResult = mainInfoService.selectPageExcludeQuickOrder(pageReqVO); 105 PageResult<MainInfoDO> pageResult = mainInfoService.selectPageExcludeQuickOrder(pageReqVO);
@@ -111,7 +109,6 @@ public class AppMainInfoController { @@ -111,7 +109,6 @@ public class AppMainInfoController {
111 109
112 @GetMapping("/export-excel") 110 @GetMapping("/export-excel")
113 @Operation(summary = "导出工单信息 Excel") 111 @Operation(summary = "导出工单信息 Excel")
114 - @PreAuthorize("@ss.hasPermission('workorder:main-info:export')")  
115 @ApiAccessLog(operateType = EXPORT) 112 @ApiAccessLog(operateType = EXPORT)
116 public void exportMainInfoExcel(@Valid MainInfoPageReqVO pageReqVO, 113 public void exportMainInfoExcel(@Valid MainInfoPageReqVO pageReqVO,
117 HttpServletResponse response) throws IOException { 114 HttpServletResponse response) throws IOException {
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
  View file @5f6ad90
@@ -148,6 +148,7 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; { @@ -148,6 +148,7 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
148 // 不查询快速工单 → 订单类型 != "Q" 148 // 不查询快速工单 → 订单类型 != "Q"
149 queryWrapper.ne(MainInfoDO::getOrderType, "Q"); 149 queryWrapper.ne(MainInfoDO::getOrderType, "Q");
150 queryWrapper.eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerCompanyId()) 150 queryWrapper.eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerCompanyId())
  151 + .eqIfPresent(MainInfoDO::getCompanyId, reqVO.getCompanyId())
151 .likeIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo()) 152 .likeIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
152 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName()) 153 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName())
153 .eqIfPresent(MainInfoDO::getStatus, reqVO.getStatus()) 154 .eqIfPresent(MainInfoDO::getStatus, reqVO.getStatus())