diff --git a/sql/dis-check-menu.sql b/sql/dis-check-menu.sql index 8b3ea59..7c27d79 100644 --- a/sql/dis-check-menu.sql +++ b/sql/dis-check-menu.sql @@ -32,7 +32,7 @@ DEALLOCATE PREPARE stmt; INSERT INTO system_menu (name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted) VALUES -('dis核对', '', 2, 1, 5698, 'disCheck', 'ep:view', 'fence/dis-check/index', 'DisCheck', 0, 1, 0, 1, '1', NOW(), '1', NOW(), 0); +('gis数据核对', '', 2, 1, 5698, 'disCheck', 'ep:view', 'fence/dis-check/index', 'DisCheck', 0, 1, 0, 1, '1', NOW(), '1', NOW(), 0); -- 2. 获取上一步插入的菜单ID,用于后续按钮权限插入 SET @dis_check_menu_id = LAST_INSERT_ID(); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java index 86c0dc6..ef33b5b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java @@ -45,7 +45,7 @@ public class DeviceUserController { return success(deviceUserService.createDeviceUser(createReqVO)); } - @PutMapping("/update/device") + @PostMapping("/update/device") @Operation(summary = "更新设备用户关系") //@PreAuthorize("@ss.hasPermission('garden:device-user:update')") public CommonResult updateDevice(@Valid @RequestBody DeviceUserUpdateReqVO updateReqVO) { @@ -119,4 +119,4 @@ public class DeviceUserController { -} \ No newline at end of file +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gis/GisRoadController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gis/GisRoadController.java index 701cf71..4ba0a95 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gis/GisRoadController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gis/GisRoadController.java @@ -67,7 +67,7 @@ public class GisRoadController { @PreAuthorize("@ss.hasPermission('garden:gis-road:export')") @ApiAccessLog(operateType = EXPORT) public void exportGisRoadExcel(@Valid GisRoadPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = gisRoadService.getGisRoadPage(pageReqVO).getList(); List exportList = new ArrayList<>(); @@ -125,3 +125,5 @@ public class GisRoadController { } } + + diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java index 4389a30..4b8daff 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java @@ -297,7 +297,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{ if ("1".equals(req.getQueryType())) { // 全域督察员查询自己发起的工单 List userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY); - if (CollectionUtils.isNotEmpty(userIds) && !userIds.contains(getLoginUserId())) { + if (!userIds.contains(getLoginUserId())) { userId = getLoginUserId(); } } diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java index 4224f29..acc5f78 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java @@ -118,7 +118,7 @@ public class MainInfoServiceImpl implements MainInfoService { if ("1".equals(pageReqVO.getQueryType())) { //全域督察员查询自己发起的工单 List userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY); - if (CollectionUtils.isNotEmpty(userIds) && !userIds.contains(getLoginUserId())) { + if (userIds.contains(getLoginUserId())) { pageReqVO.setUserId(getLoginUserId()); pageReqVO.setWorkerCompanyId(null); }