Merge remote-tracking branch 'origin/master'

xuhy

2024-08-17 32c43da47cfa3892a2f3c58e0ec195a8ee7ab982

Merge remote-tracking branch 'origin/master'

 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-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java

@@ -183,9 +183,12 @@
        return R.ok();
    }
    @ApiOperation(value = "单位管理删除", tags = {"用户管理-单位管理"})
    @PostMapping(value = "/unit/delete/{id}")
    public R add(@PathVariable Integer id) {
        otherClient.unitDelete(id);
    @DeleteMapping(value = "/unit/delete")
    public R add(@RequestParam String ids) {
        String[] split = ids.split(",");
        for (String s : split) {
            otherClient.unitDelete(Integer.valueOf(s));
        }
        return R.ok();

    }
@@ -498,5 +501,12 @@
        appUserService.updateById(appUser);
        return R.ok();
    }


//    @ApiOperation(value = "签到", tags = {"小程序-个人中心-签到"})
//    @PostMapping(value = "/user/sign")
//    public R sign() {
//
//    }
}


 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;

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java

@@ -117,11 +117,7 @@
        return AjaxResult.ok(tCouponService.pageList(dto));
    }

    @PostMapping(value = "/getCouponById")
    public R<TCoupon> getCouponById(@RequestParam Integer id) {
        return R.ok(tCouponService.getById(id));

    }
    /**
     * 小程序远程调用 获取优惠券信息
     */