合并代码

puzhibing

2024-08-17 a418a5bb7484819553b5b7345e69fc442142e2f0

合并代码

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java

@@ -66,7 +66,7 @@


    @PostMapping(value = "/t-coupon/getCouponById")
    R<TCoupon> getCouponById(@RequestParam Integer id);
    R<TCoupon> getCouponById(@RequestParam("id") Integer id);




 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TMonitoringEquipmentServiceImpl.java

@@ -44,7 +44,6 @@
    private TParkingLotService parkingLotService;
    @Override
    public PageInfo<TMonitoringEquipmentVO> pageList(TMonitoringEquipmentQuery query) {

        //校验合作商权限
        SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
        Integer roleType = sysUser.getRoleType();
@@ -56,8 +55,12 @@
        PageInfo<TMonitoringEquipmentVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
        List<TMonitoringEquipmentVO> list = this.baseMapper.pageList(query,pageInfo,parkingLotIds);
        for (TMonitoringEquipmentVO monitoringEquipmentVO : list) {
            Integer siteId = parkingLotVOS.stream().filter(park->park.getId().equals(monitoringEquipmentVO.getParkingLotId())).findFirst().get().getSiteId();
            monitoringEquipmentVO.setAuthQueryInfo(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.PARKING_LOT_MONITOR));
            TParkingLotVO tParkingLotVO = parkingLotVOS.stream().filter(park -> park.getId().equals(monitoringEquipmentVO.getParkingLotId())).findFirst().get();
            if(null != tParkingLotVO){
                Integer siteId = tParkingLotVO.getSiteId();
                monitoringEquipmentVO.setAuthQueryInfo(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.PARKING_LOT_MONITOR));
            }

        }
        pageInfo.setRecords(list);
        return pageInfo;