BJ_FS / urbanops

Commit 72b62c4caeda0fd31b6bf1069903dd675ba427f2

Authored by wangqian
2 parents a806e764 8502855c

Merge branch 'dev'

Inline Side-by-side
Showing 5 changed files with 8 additions and 6 deletions
sql/dis-check-menu.sql
  View file @72b62c4
... ... @@ -32,7 +32,7 @@ DEALLOCATE PREPARE stmt;
32 32 INSERT INTO system_menu
33 33 (name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
34 34 VALUES
35   -('dis核对', '', 2, 1, 5698, 'disCheck', 'ep:view', 'fence/dis-check/index', 'DisCheck', 0, 1, 0, 1, '1', NOW(), '1', NOW(), 0);
  35 +('gis数据核对', '', 2, 1, 5698, 'disCheck', 'ep:view', 'fence/dis-check/index', 'DisCheck', 0, 1, 0, 1, '1', NOW(), '1', NOW(), 0);
36 36  
37 37 -- 2. 获取上一步插入的菜单ID，用于后续按钮权限插入
38 38 SET @dis_check_menu_id = LAST_INSERT_ID();
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java
  View file @72b62c4
... ... @@ -45,7 +45,7 @@ public class DeviceUserController {
45 45 return success(deviceUserService.createDeviceUser(createReqVO));
46 46 }
47 47  
48   - @PutMapping("/update/device")
  48 + @PostMapping("/update/device")
49 49 @Operation(summary = "更新设备用户关系")
50 50 //@PreAuthorize("@ss.hasPermission('garden:device-user:update')")
51 51 public CommonResult<Boolean> updateDevice(@Valid @RequestBody DeviceUserUpdateReqVO updateReqVO) {
... ... @@ -119,4 +119,4 @@ public class DeviceUserController {
119 119  
120 120  
121 121  
122   -}
123 122 \ No newline at end of file
  123 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gis/GisRoadController.java
  View file @72b62c4
... ... @@ -67,7 +67,7 @@ public class GisRoadController {
67 67 @PreAuthorize("@ss.hasPermission('garden:gis-road:export')")
68 68 @ApiAccessLog(operateType = EXPORT)
69 69 public void exportGisRoadExcel(@Valid GisRoadPageReqVO pageReqVO,
70   - HttpServletResponse response) throws IOException {
  70 + HttpServletResponse response) throws IOException {
71 71 pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
72 72 List<GisRoadRespVO> list = gisRoadService.getGisRoadPage(pageReqVO).getList();
73 73 List<GisRoadExportVO> exportList = new ArrayList<>();
... ... @@ -125,3 +125,5 @@ public class GisRoadController {
125 125 }
126 126  
127 127 }
  128 +
  129 +
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
  View file @72b62c4
... ... @@ -297,7 +297,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
297 297 if ("1".equals(req.getQueryType())) {
298 298 // 全域督察员查询自己发起的工单
299 299 List<Long> userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY);
300   - if (CollectionUtils.isNotEmpty(userIds) && !userIds.contains(getLoginUserId())) {
  300 + if (!userIds.contains(getLoginUserId())) {
301 301 userId = getLoginUserId();
302 302 }
303 303 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java
  View file @72b62c4
... ... @@ -118,7 +118,7 @@ public class MainInfoServiceImpl implements MainInfoService {
118 118 if ("1".equals(pageReqVO.getQueryType())) {
119 119 //全域督察员查询自己发起的工单
120 120 List<Long> userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY);
121   - if (CollectionUtils.isNotEmpty(userIds) && !userIds.contains(getLoginUserId())) {
  121 + if (userIds.contains(getLoginUserId())) {
122 122 pageReqVO.setUserId(getLoginUserId());
123 123 pageReqVO.setWorkerCompanyId(null);
124 124 }
... ...