diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppGoodsController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppGoodsController.java index c72aa702..09f15246 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppGoodsController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppGoodsController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.inspection.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.inspection.entity.InspectionAppointment; import cn.iocoder.yudao.module.inspection.entity.InspectionGoodsSku; import cn.iocoder.yudao.module.inspection.entity.InspectionPickCar; @@ -31,6 +32,7 @@ public class AppGoodsController extends BaseController { * 分类列表查询 */ @GetMapping("/categoryList") + @TenantIgnore public CommonResult categoryList() { return success(appInspectionGoodsService.categoryList()); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java index ba25b269..c7c56497 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.inspection.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.appBase.entity.AppSwiper; import cn.iocoder.yudao.module.appBase.service.IAppSwiperService; import cn.iocoder.yudao.module.core.page.TableDataInfo; @@ -39,6 +40,7 @@ public class AppHomeController extends BaseController { * 首页swiper */ @GetMapping("/listSwiper") + @TenantIgnore public CommonResult listSwiper(AppSwiper appSwiper) { List list = appSwiperService.selectAppSwiperList(appSwiper); @@ -50,6 +52,7 @@ public class AppHomeController extends BaseController { * 首页公告 */ @GetMapping("/listNews") + @TenantIgnore public CommonResult listNews() { List list = inspectionNewsService.appHomeNewsList(); @@ -62,6 +65,7 @@ public class AppHomeController extends BaseController { * 首页商品推荐 */ @GetMapping("/homePartner") + @TenantIgnore public TableDataInfo homePartner(Double longitude, Double latitude) { startPage(); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java index 422e80f2..18700520 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.inspection.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.payment.entity.OrderInfo; import cn.iocoder.yudao.module.payment.service.OrderInfoService; import com.github.pagehelper.PageHelper; @@ -25,6 +26,7 @@ public class AppOrderController extends BaseController { private OrderInfoService orderInfoService; @GetMapping("/orderList") + @TenantIgnore public TableDataInfo orderList(String status, String title, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum, pageSize); List orderInfos = orderInfoService.orderListApp(status, title, "jc"); @@ -36,6 +38,7 @@ public class AppOrderController extends BaseController { } //获取检测的数据 @GetMapping("/inspectionList") + @TenantIgnore public TableDataInfo inspectionList(String status,Integer pageNum,Integer pageSize) { PageHelper.startPage(pageNum,pageSize); List inspectionInfos = appInspectionOrderService.inspectionList(status); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java index dc93a082..6c10a3d7 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.inspection.query.PartnerListQuery; @@ -27,6 +28,7 @@ public class AppPartnerController extends BaseController { * 查询合作商管理列表 */ @GetMapping("/list") + @TenantIgnore public TableDataInfo partnerList(PartnerListQuery partnerListQuery) { startPage(); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java index d19c9ae6..5501085a 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.inspection.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.permission.PermissionService; @@ -40,6 +41,7 @@ public class AppUserOwnController extends BaseController { } @GetMapping("/getCars") + @TenantIgnore public CommonResult getCars() { return success(ownService.getCars()); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java index 9ed115ed..671c7d2b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.inspection.entity.InspectionAppointment; import cn.iocoder.yudao.module.inspection.service.IInspectionAppointmentService; import cn.iocoder.yudao.util.ExcelUtil; @@ -91,6 +92,7 @@ public class InspectionAppointmentController extends BaseController } @GetMapping("/getAppointmentOwn") + @TenantIgnore public CommonResult getAppointmentOwn() { return success(inspectionAppointmentService.getAppointmentOwn()); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java index f3f877b3..a7a5b03b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java @@ -40,8 +40,7 @@ public class InspectionEquInfoController extends BaseController */ @GetMapping("/list") public TableDataInfo list(InspectionEquInfo inspectionEquInfo) throws Exception { - ShopMallPartners partners = partnerService.shopInfo(); - inspectionEquInfo.setPartnerId(partners.getPartnerId()); + startPage(); List list = inspectionEquInfoService.selectInspectionEquInfoList(inspectionEquInfo); return getDataTable(list); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java index e016441c..3325b3b8 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.util.ExcelUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; @@ -31,6 +32,7 @@ public class SiteInfoController extends BaseController * 查询inspection列表 */ @GetMapping("/list") + @TenantIgnore public TableDataInfo list(SiteInfo siteInfo, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index 23143b24..f8c3213f 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import cn.iocoder.yudao.module.config.service.IInspSysConfigService; import cn.iocoder.yudao.module.partner.entity.PartnerBalance; @@ -158,6 +159,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl userRoleIdListByUserId = permissionService.getUserRoleIdListByUserId(user.getId()); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java index db6f740a..b9b63d48 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java @@ -7,6 +7,7 @@ import java.util.List; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -263,6 +264,7 @@ public class InspectionNewsServiceImpl extends ServiceImpl msgList(Long partnerId) { List news = baseMapper.msgList(partnerId); news.forEach(it->{ diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopUserCarController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopUserCarController.java index 04762e96..15121a5e 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopUserCarController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopUserCarController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.shop.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.core.page.TableDataInfo; import cn.iocoder.yudao.module.shop.entity.ShopUserCar; @@ -104,6 +105,7 @@ public class ShopUserCarController extends BaseController } @GetMapping(value = "/getUserCar") + @TenantIgnore public CommonResult getUserCarByUserId() { return success(shopUserCarService.selectShopUserCarByUserId(getUserId())); diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml index e627f823..ec136d46 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml @@ -9,9 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"