From 43556f65c9c08fe87327587a864fe24cc1f4839f Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 4 Jun 2024 18:01:48 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisBaseController.java | 60 +++++++++++++++++++ .../erp/web/emis/EmisBrandController.java | 2 +- .../erp/web/emis/EmisCommonController.java | 2 +- .../web/emis/EmisCommonToolsController.java | 2 +- .../erp/web/emis/EmisContinentController.java | 2 +- .../web/emis/EmisCountryAreaController.java | 2 +- .../erp/web/emis/EmisCountryController.java | 2 +- .../emis/EmisCustomerAccountController.java | 2 +- .../emis/EmisCustomerAddressController.java | 2 +- .../EmisCustomerSettleBillController.java | 2 +- .../web/emis/EmisCustomerUserController.java | 2 +- .../web/emis/EmisDestinationController.java | 2 +- .../EmisElectronicPagApplyController.java | 2 +- .../web/emis/EmisElectronicPagController.java | 2 +- .../emis/EmisElectronicSitePagController.java | 2 +- .../erp/web/emis/EmisFeeTypeController.java | 2 +- .../erp/web/emis/EmisGoodsController.java | 2 +- .../erp/web/emis/EmisMaterialController.java | 2 +- .../emis/EmisMonthpayAccountController.java | 2 +- .../emis/EmisMonthpayUseApplyController.java | 2 +- .../web/emis/EmisNotCalcAgingController.java | 2 +- .../erp/web/emis/EmisPrintTplController.java | 2 +- .../web/emis/EmisPrintTplRelController.java | 2 +- .../web/emis/EmisProblemTypeController.java | 2 +- .../web/emis/EmisQuoteDispAreaController.java | 2 +- .../emis/EmisQuoteExpressionController.java | 2 +- .../web/emis/EmisQuotePriceController.java | 2 +- .../web/emis/EmisQuoteSendAreaController.java | 2 +- .../erp/web/emis/EmisRegionController.java | 2 +- .../web/emis/EmisSiteAccountController.java | 2 +- .../erp/web/emis/EmisSiteController.java | 2 +- .../emis/EmisSiteSettleRecordController.java | 2 +- .../emis/EmisSpecialCalcWeightController.java | 2 +- .../erp/web/emis/EmisStaffController.java | 2 +- .../erp/web/emis/EmisTmsPackController.java | 2 +- .../web/emis/EmisTmsPackDtlController.java | 2 +- .../emis/EmisTmsScanPicInfoController.java | 2 +- .../web/emis/EmisTmsScanRecordController.java | 10 +++- .../web/emis/EmisTmsSiteBatchController.java | 2 +- .../emis/EmisTmsSiteBatchDtlController.java | 2 +- .../EmisTmsSiteBatchLoadingController.java | 2 +- .../web/emis/EmisTmsTransPlanController.java | 2 +- .../emis/EmisTmsTransPlanDtlController.java | 2 +- .../erp/web/emis/EmisTransLineController.java | 2 +- .../web/emis/EmisTransProductController.java | 2 +- .../emis/EmisWarehouseInBatchController.java | 2 +- .../web/emis/EmisWarehouseInController.java | 2 +- .../emis/EmisWarehouseInDtlController.java | 2 +- .../emis/EmisWaybillAttachmentController.java | 2 +- .../web/emis/EmisWaybillCargoController.java | 2 +- .../erp/web/emis/EmisWaybillController.java | 36 ++++------- .../emis/EmisWaybillFeeitemController.java | 2 +- .../emis/EmisWaybillProblemFaqController.java | 2 +- .../EmisWaybillProblemInfoController.java | 2 +- .../emis/EmisWaybillTransferController.java | 2 +- 55 files changed, 132 insertions(+), 78 deletions(-) create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java new file mode 100644 index 000000000..860ef4c26 --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java @@ -0,0 +1,60 @@ + +/** + * @Project: emis + * @Title: EmisBrandController.java + * @author linfso + * @date 2023-12-14 13:02:48 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

品牌 控制器

+ */ + +package com.xdadan.erp.web.emis; + +import com.xdadan.erp.common.annotation.Log; +import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; +import com.xdadan.erp.common.core.controller.BaseController; +import com.xdadan.erp.common.core.domain.AjaxResult; +import com.xdadan.erp.common.core.domain.BaseEntity; +import com.xdadan.erp.common.core.page.TableDataInfo; +import com.xdadan.erp.common.enums.BusinessType; +import com.xdadan.erp.common.utils.poi.ExcelUtil; +import com.xdadan.erp.emis.domain.EmisBrand; +import com.xdadan.erp.emis.service.IEmisBrandService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * EmisBaseController + * + * @author linfso + * @date 2023-12-14 13:02:48 + */ + +public class EmisBaseController extends BaseController +{ + + /** + * 设置通用查询参数，用于区分数据权限查询 + * @param entity + */ + public void setPrivParams(BaseEntity entity){ + + if(!getLoginUser().getUser().isTopSite()){ + try { + entity.getParams().put("isPrivQuery", "T"); + entity.getParams().put("privSiteCode", getLoginUser().getUser().getOwnerSiteCode()); + entity.getParams().put("privEmpCode", getLoginUser().getUser().getEmpCode()); + entity.getParams().put("privEmpName", getLoginUser().getUser().getEmpName()); + }catch (Exception ex){ + + } + } + + } + +} diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBrandController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBrandController.java index d5ec15544..605546ad1 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBrandController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBrandController.java @@ -46,7 +46,7 @@ import com.xdadan.erp.emis.service.IEmisBrandService; */ @RestController @RequestMapping("/emis/emisBrand") -public class EmisBrandController extends BaseController +public class EmisBrandController extends EmisBaseController { @Autowired private IEmisBrandService emisBrandService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 65447b3c5..65e516216 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -55,7 +55,7 @@ import java.util.Map; */ @RestController @RequestMapping("/emis/common") -public class EmisCommonController extends BaseController +public class EmisCommonController extends EmisBaseController { @Autowired diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java index a3abeac71..173e09df2 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java @@ -42,7 +42,7 @@ import java.util.Random; */ @RestController @RequestMapping("/emis/commonTools") -public class EmisCommonToolsController extends BaseController +public class EmisCommonToolsController extends EmisBaseController { @Autowired diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisContinentController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisContinentController.java index de4042f28..fd1444423 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisContinentController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisContinentController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisContinentService; */ @RestController @RequestMapping("/emis/emisContinent") -public class EmisContinentController extends BaseController +public class EmisContinentController extends EmisBaseController { @Autowired private IEmisContinentService emisContinentService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryAreaController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryAreaController.java index 52a0d2a55..56600a496 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryAreaController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryAreaController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisCountryAreaService; */ @RestController @RequestMapping("/emis/emisCountryArea") -public class EmisCountryAreaController extends BaseController +public class EmisCountryAreaController extends EmisBaseController { @Autowired private IEmisCountryAreaService emisCountryAreaService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java index e17b70d98..ad5634dd4 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java @@ -48,7 +48,7 @@ import com.xdadan.erp.emis.service.IEmisCountryService; */ @RestController @RequestMapping("/emis/emisCountry") -public class EmisCountryController extends BaseController +public class EmisCountryController extends EmisBaseController { @Autowired private IEmisCountryService emisCountryService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAccountController.java index 2b1c7b05f..f214989a1 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAccountController.java @@ -36,7 +36,7 @@ import com.xdadan.erp.emis.service.IEmisCustomerAccountService; */ @RestController @RequestMapping("/emis/emisCustomerAccount") -public class EmisCustomerAccountController extends BaseController +public class EmisCustomerAccountController extends EmisBaseController { @Autowired private IEmisCustomerAccountService emisCustomerAccountService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java index 7f6d0e085..db4e09dbc 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java @@ -39,7 +39,7 @@ import com.xdadan.erp.emis.service.IEmisCustomerAddressService; */ @RestController @RequestMapping("/emis/emisCustomerAddress") -public class EmisCustomerAddressController extends BaseController +public class EmisCustomerAddressController extends EmisBaseController { @Autowired private IEmisCustomerAddressService emisCustomerAddressService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerSettleBillController.java index fd2e3dc03..7e4ec8d2b 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerSettleBillController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisCustomerSettleBillService; */ @RestController @RequestMapping("/emis/emisCustomerSettleBill") -public class EmisCustomerSettleBillController extends BaseController +public class EmisCustomerSettleBillController extends EmisBaseController { @Autowired private IEmisCustomerSettleBillService emisCustomerSettleBillService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java index 23f6b5f3e..a12c3dd19 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java @@ -49,7 +49,7 @@ import com.xdadan.erp.emis.service.IEmisCustomerUserService; */ @RestController @RequestMapping("/emis/emisCustomerUser") -public class EmisCustomerUserController extends BaseController +public class EmisCustomerUserController extends EmisBaseController { @Autowired private IEmisCustomerUserService emisCustomerUserService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java index 12fa7ab4f..b15919c93 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisDestinationController.java @@ -46,7 +46,7 @@ import com.xdadan.erp.emis.service.IEmisDestinationService; */ @RestController @RequestMapping("/emis/emisDestination") -public class EmisDestinationController extends BaseController +public class EmisDestinationController extends EmisBaseController { @Autowired private IEmisDestinationService emisDestinationService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java index d5e958b4b..f5876079b 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java @@ -48,7 +48,7 @@ import com.xdadan.erp.emis.service.IEmisElectronicPagApplyService; */ @RestController @RequestMapping("/emis/emisElectronicPagApply") -public class EmisElectronicPagApplyController extends BaseController +public class EmisElectronicPagApplyController extends EmisBaseController { @Autowired private IEmisElectronicPagApplyService emisElectronicPagApplyService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagController.java index 1de669a56..c05d5e434 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisElectronicPagService; */ @RestController @RequestMapping("/emis/emisElectronicPag") -public class EmisElectronicPagController extends BaseController +public class EmisElectronicPagController extends EmisBaseController { @Autowired private IEmisElectronicPagService emisElectronicPagService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicSitePagController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicSitePagController.java index 0a43d54b8..6584eac46 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicSitePagController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicSitePagController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisElectronicSitePagService; */ @RestController @RequestMapping("/emis/emisElectronicSitePag") -public class EmisElectronicSitePagController extends BaseController +public class EmisElectronicSitePagController extends EmisBaseController { @Autowired private IEmisElectronicSitePagService emisElectronicSitePagService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisFeeTypeController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisFeeTypeController.java index fe567673f..b8fa83c81 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisFeeTypeController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisFeeTypeController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisFeeTypeService; */ @RestController @RequestMapping("/emis/emisFeeType") -public class EmisFeeTypeController extends BaseController +public class EmisFeeTypeController extends EmisBaseController { @Autowired private IEmisFeeTypeService emisFeeTypeService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java index 29b8d1274..c97480cf1 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java @@ -46,7 +46,7 @@ import com.xdadan.erp.emis.service.IEmisGoodsService; */ @RestController @RequestMapping("/emis/emisGoods") -public class EmisGoodsController extends BaseController +public class EmisGoodsController extends EmisBaseController { @Autowired private IEmisGoodsService emisGoodsService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMaterialController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMaterialController.java index bab2877b0..acd0e55de 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMaterialController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMaterialController.java @@ -44,7 +44,7 @@ import com.xdadan.erp.emis.service.IEmisMaterialService; */ @RestController @RequestMapping("/emis/emisMaterial") -public class EmisMaterialController extends BaseController +public class EmisMaterialController extends EmisBaseController { @Autowired private IEmisMaterialService emisMaterialService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java index 69f36d735..7c5c6279f 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java @@ -48,7 +48,7 @@ import com.xdadan.erp.emis.service.IEmisMonthpayAccountService; */ @RestController @RequestMapping("/emis/emisMonthpayAccount") -public class EmisMonthpayAccountController extends BaseController +public class EmisMonthpayAccountController extends EmisBaseController { @Autowired private IEmisMonthpayAccountService emisMonthpayAccountService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayUseApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayUseApplyController.java index 5a20ecb0b..d807f5e2c 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayUseApplyController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayUseApplyController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisMonthpayUseApplyService; */ @RestController @RequestMapping("/emis/emisMonthpayUseApply") -public class EmisMonthpayUseApplyController extends BaseController +public class EmisMonthpayUseApplyController extends EmisBaseController { @Autowired private IEmisMonthpayUseApplyService emisMonthpayUseApplyService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisNotCalcAgingController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisNotCalcAgingController.java index 1cf6fae71..4f95ec16a 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisNotCalcAgingController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisNotCalcAgingController.java @@ -44,7 +44,7 @@ import com.xdadan.erp.emis.service.IEmisNotCalcAgingService; */ @RestController @RequestMapping("/emis/emisNotCalcAging") -public class EmisNotCalcAgingController extends BaseController +public class EmisNotCalcAgingController extends EmisBaseController { @Autowired private IEmisNotCalcAgingService emisNotCalcAgingService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisPrintTplController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisPrintTplController.java index dc6d421d6..ce40f7705 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisPrintTplController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisPrintTplController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisPrintTplService; */ @RestController @RequestMapping("/emis/emisPrintTpl") -public class EmisPrintTplController extends BaseController +public class EmisPrintTplController extends EmisBaseController { @Autowired private IEmisPrintTplService emisPrintTplService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisPrintTplRelController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisPrintTplRelController.java index 24436304e..9e2f0ce51 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisPrintTplRelController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisPrintTplRelController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisPrintTplRelService; */ @RestController @RequestMapping("/emis/emisPrintTplRel") -public class EmisPrintTplRelController extends BaseController +public class EmisPrintTplRelController extends EmisBaseController { @Autowired private IEmisPrintTplRelService emisPrintTplRelService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisProblemTypeController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisProblemTypeController.java index d4d206cf1..485533cfc 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisProblemTypeController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisProblemTypeController.java @@ -48,7 +48,7 @@ import com.xdadan.erp.emis.service.IEmisProblemTypeService; */ @RestController @RequestMapping("/emis/emisProblemType") -public class EmisProblemTypeController extends BaseController +public class EmisProblemTypeController extends EmisBaseController { @Autowired private IEmisProblemTypeService emisProblemTypeService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteDispAreaController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteDispAreaController.java index 452c37bd1..6077bd753 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteDispAreaController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteDispAreaController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisQuoteDispAreaService; */ @RestController @RequestMapping("/emis/emisQuoteDispArea") -public class EmisQuoteDispAreaController extends BaseController +public class EmisQuoteDispAreaController extends EmisBaseController { @Autowired private IEmisQuoteDispAreaService emisQuoteDispAreaService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteExpressionController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteExpressionController.java index 530e3228c..61282742d 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteExpressionController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteExpressionController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisQuoteExpressionService; */ @RestController @RequestMapping("/emis/emisQuoteExpression") -public class EmisQuoteExpressionController extends BaseController +public class EmisQuoteExpressionController extends EmisBaseController { @Autowired private IEmisQuoteExpressionService emisQuoteExpressionService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java index ee296b6bd..09b770d49 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java @@ -51,7 +51,7 @@ import com.xdadan.erp.emis.service.IEmisQuotePriceService; */ @RestController @RequestMapping("/emis/emisQuotePrice") -public class EmisQuotePriceController extends BaseController +public class EmisQuotePriceController extends EmisBaseController { @Autowired private IEmisQuotePriceService emisQuotePriceService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteSendAreaController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteSendAreaController.java index fadbd7d7e..40f40b0d4 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteSendAreaController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuoteSendAreaController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisQuoteSendAreaService; */ @RestController @RequestMapping("/emis/emisQuoteSendArea") -public class EmisQuoteSendAreaController extends BaseController +public class EmisQuoteSendAreaController extends EmisBaseController { @Autowired private IEmisQuoteSendAreaService emisQuoteSendAreaService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java index c6fbccb55..b5c07c9ae 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java @@ -46,7 +46,7 @@ import com.xdadan.erp.emis.service.IEmisRegionService; */ @RestController @RequestMapping("/emis/emisRegion") -public class EmisRegionController extends BaseController +public class EmisRegionController extends EmisBaseController { @Autowired private IEmisRegionService emisRegionService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java index 60e6ea913..c5461559d 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisSiteAccountService; */ @RestController @RequestMapping("/emis/emisSiteAccount") -public class EmisSiteAccountController extends BaseController +public class EmisSiteAccountController extends EmisBaseController { @Autowired private IEmisSiteAccountService emisSiteAccountService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java index e34a03415..6aa837a6e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java @@ -46,7 +46,7 @@ import com.xdadan.erp.emis.service.IEmisSiteService; */ @RestController @RequestMapping("/emis/emisSite") -public class EmisSiteController extends BaseController +public class EmisSiteController extends EmisBaseController { @Autowired private IEmisSiteService emisSiteService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteSettleRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteSettleRecordController.java index 827248de6..f5c2d8397 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteSettleRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteSettleRecordController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisSiteSettleRecordService; */ @RestController @RequestMapping("/emis/emisSiteSettleRecord") -public class EmisSiteSettleRecordController extends BaseController +public class EmisSiteSettleRecordController extends EmisBaseController { @Autowired private IEmisSiteSettleRecordService emisSiteSettleRecordService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSpecialCalcWeightController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSpecialCalcWeightController.java index fc7430bfb..7da7e94cc 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSpecialCalcWeightController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSpecialCalcWeightController.java @@ -45,7 +45,7 @@ import com.xdadan.erp.emis.service.IEmisSpecialCalcWeightService; */ @RestController @RequestMapping("/emis/emisSpecialCalcWeight") -public class EmisSpecialCalcWeightController extends BaseController +public class EmisSpecialCalcWeightController extends EmisBaseController { @Autowired private IEmisSpecialCalcWeightService emisSpecialCalcWeightService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java index fbacfdd85..8bf33925b 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java @@ -50,7 +50,7 @@ import java.util.Map; */ @RestController @RequestMapping("/emis/emisStaff") -public class EmisStaffController extends BaseController +public class EmisStaffController extends EmisBaseController { @Autowired private ISysUserService userService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java index f2d5b3860..7fbbdeea8 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java @@ -47,7 +47,7 @@ import com.xdadan.erp.emis.service.IEmisTmsPackService; */ @RestController @RequestMapping("/emis/emisTmsPack") -public class EmisTmsPackController extends BaseController +public class EmisTmsPackController extends EmisBaseController { @Autowired private IEmisTmsPackService emisTmsPackService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackDtlController.java index 3b59818e3..bc4cb380c 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackDtlController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackDtlController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisTmsPackDtlService; */ @RestController @RequestMapping("/emis/emisTmsPackDtl") -public class EmisTmsPackDtlController extends BaseController +public class EmisTmsPackDtlController extends EmisBaseController { @Autowired private IEmisTmsPackDtlService emisTmsPackDtlService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanPicInfoController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanPicInfoController.java index de1fe3df8..33a9c68cd 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanPicInfoController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanPicInfoController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisTmsScanPicInfoService; */ @RestController @RequestMapping("/emis/emisTmsScanPicInfo") -public class EmisTmsScanPicInfoController extends BaseController +public class EmisTmsScanPicInfoController extends EmisBaseController { @Autowired private IEmisTmsScanPicInfoService emisTmsScanPicInfoService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java index d8e04bf27..9de98df42 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java @@ -58,7 +58,7 @@ import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; @Slf4j @RestController @RequestMapping("/emis/emisTmsScanRecord") -public class EmisTmsScanRecordController extends BaseController +public class EmisTmsScanRecordController extends EmisBaseController { @Autowired private IEmisTmsScanRecordService emisTmsScanRecordService; @@ -82,6 +82,14 @@ public class EmisTmsScanRecordController extends BaseController public TableDataInfo queryScanStatList(EmisTmsScanRecord emisTmsScanRecord) { startPage(); + + if(!getLoginUser().getUser().isTopSite()){ + emisTmsScanRecord.getParams().put("innerQuery","1"); + emisTmsScanRecord.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode()); + emisTmsScanRecord.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode()); + emisTmsScanRecord.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); + } + emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode()); List list = emisTmsScanRecordService.queryScanStatList(emisTmsScanRecord); return getDataTable(list); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java index 08d052b54..1cffa647c 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisTmsSiteBatchService; */ @RestController @RequestMapping("/emis/emisTmsSiteBatch") -public class EmisTmsSiteBatchController extends BaseController +public class EmisTmsSiteBatchController extends EmisBaseController { @Autowired private IEmisTmsSiteBatchService emisTmsSiteBatchService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchDtlController.java index f01eed272..80d7cdb35 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchDtlController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchDtlController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisTmsSiteBatchDtlService; */ @RestController @RequestMapping("/emis/emisTmsSiteBatchDtl") -public class EmisTmsSiteBatchDtlController extends BaseController +public class EmisTmsSiteBatchDtlController extends EmisBaseController { @Autowired private IEmisTmsSiteBatchDtlService emisTmsSiteBatchDtlService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchLoadingController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchLoadingController.java index e0973b652..157a5d9cd 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchLoadingController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchLoadingController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisTmsSiteBatchLoadingService; */ @RestController @RequestMapping("/emis/emisTmsSiteBatchLoading") -public class EmisTmsSiteBatchLoadingController extends BaseController +public class EmisTmsSiteBatchLoadingController extends EmisBaseController { @Autowired private IEmisTmsSiteBatchLoadingService emisTmsSiteBatchLoadingService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsTransPlanController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsTransPlanController.java index 780358414..5a28d8bd8 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsTransPlanController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsTransPlanController.java @@ -46,7 +46,7 @@ import com.xdadan.erp.emis.service.IEmisTmsTransPlanService; */ @RestController @RequestMapping("/emis/emisTmsTransPlan") -public class EmisTmsTransPlanController extends BaseController +public class EmisTmsTransPlanController extends EmisBaseController { @Autowired private IEmisTmsTransPlanService emisTmsTransPlanService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsTransPlanDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsTransPlanDtlController.java index dfbbe496a..310db34c4 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsTransPlanDtlController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsTransPlanDtlController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisTmsTransPlanDtlService; */ @RestController @RequestMapping("/emis/emisTmsTransPlanDtl") -public class EmisTmsTransPlanDtlController extends BaseController +public class EmisTmsTransPlanDtlController extends EmisBaseController { @Autowired private IEmisTmsTransPlanDtlService emisTmsTransPlanDtlService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java index 79ef9a9c6..fd1261f95 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java @@ -48,7 +48,7 @@ import com.xdadan.erp.emis.service.IEmisTransLineService; */ @RestController @RequestMapping("/emis/emisTransLine") -public class EmisTransLineController extends BaseController +public class EmisTransLineController extends EmisBaseController { @Autowired private IEmisTransLineService emisTransLineService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java index 81e851c24..56b1d7cda 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java @@ -46,7 +46,7 @@ import com.xdadan.erp.emis.service.IEmisTransProductService; */ @RestController @RequestMapping("/emis/emisTransProduct") -public class EmisTransProductController extends BaseController +public class EmisTransProductController extends EmisBaseController { @Autowired private IEmisTransProductService emisTransProductService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java index 72810c2cd..4cd2ada3e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisWarehouseInBatchService; */ @RestController @RequestMapping("/emis/emisWarehouseInBatch") -public class EmisWarehouseInBatchController extends BaseController +public class EmisWarehouseInBatchController extends EmisBaseController { @Autowired private IEmisWarehouseInBatchService emisWarehouseInBatchService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java index 5f1a0d7ca..716ac3788 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java @@ -45,7 +45,7 @@ import com.xdadan.erp.emis.service.IEmisWarehouseInService; */ @RestController @RequestMapping("/emis/emisWarehouseIn") -public class EmisWarehouseInController extends BaseController +public class EmisWarehouseInController extends EmisBaseController { @Autowired private IEmisWarehouseInService emisWarehouseInService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInDtlController.java index 4356f7993..85cf8419e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInDtlController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInDtlController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisWarehouseInDtlService; */ @RestController @RequestMapping("/emis/emisWarehouseInDtl") -public class EmisWarehouseInDtlController extends BaseController +public class EmisWarehouseInDtlController extends EmisBaseController { @Autowired private IEmisWarehouseInDtlService emisWarehouseInDtlService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java index 560beaf49..13df48f9c 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java @@ -53,7 +53,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillAttachmentService; */ @RestController @RequestMapping("/emis/emisWaybillAttachment") -public class EmisWaybillAttachmentController extends BaseController +public class EmisWaybillAttachmentController extends EmisBaseController { @Autowired private IEmisWaybillAttachmentService emisWaybillAttachmentService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java index 0a973582a..eb8168119 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillCargoService; */ @RestController @RequestMapping("/emis/emisWaybillCargo") -public class EmisWaybillCargoController extends BaseController +public class EmisWaybillCargoController extends EmisBaseController { @Autowired private IEmisWaybillCargoService emisWaybillCargoService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index d4c0141f6..bf1f0c890 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -67,7 +67,7 @@ import com.xdadan.erp.emis.domain.EmisWaybill; @Slf4j @RestController @RequestMapping("/emis/emisWaybill") -public class EmisWaybillController extends BaseController +public class EmisWaybillController extends EmisBaseController { @Autowired private IEmisWaybillService emisWaybillService; @@ -294,12 +294,8 @@ public class EmisWaybillController extends BaseController startPage(); - if(!(getLoginUser().getUser().isTopSite())){ - emisWaybill.getParams().put("innerQuery","1"); - emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode()); - emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode()); - emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); - } + // 设置通用权限查询参数 + setPrivParams(emisWaybill); if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ String[] billCodeSortList = emisWaybill.getBillCode().split(","); @@ -330,12 +326,8 @@ public class EmisWaybillController extends BaseController startPage(); - if(!(getLoginUser().getUser().isTopSite())){ - emisWaybill.getParams().put("innerQuery","1"); - emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode()); - emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode()); - emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); - } + // 设置通用权限查询参数 + setPrivParams(emisWaybill); if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ String[] billCodeSortList = emisWaybill.getBillCode().split(","); @@ -375,12 +367,9 @@ public class EmisWaybillController extends BaseController public TableDataInfo listSimple(EmisWaybill emisWaybill) { startPage(); - if(!getLoginUser().getUser().isTopSite()){ - emisWaybill.getParams().put("innerQuery","1"); - emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode()); - emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode()); - emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); - } + + // 设置通用权限查询参数 + setPrivParams(emisWaybill); if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ String[] billCodeSortList = emisWaybill.getBillCode().split(","); @@ -408,12 +397,9 @@ public class EmisWaybillController extends BaseController public TableDataInfo queryPrintListSimple(EmisWaybill emisWaybill) { startPage(); - if(!getLoginUser().getUser().isTopSite()){ - emisWaybill.getParams().put("innerQuery","1"); - emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode()); - emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode()); - emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); - } + + // 设置通用权限查询参数 + setPrivParams(emisWaybill); if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ String[] billCodeSortList = emisWaybill.getBillCode().split(","); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillFeeitemController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillFeeitemController.java index dac9046c2..dbcf19b64 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillFeeitemController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillFeeitemController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillFeeitemService; */ @RestController @RequestMapping("/emis/emisWaybillFeeitem") -public class EmisWaybillFeeitemController extends BaseController +public class EmisWaybillFeeitemController extends EmisBaseController { @Autowired private IEmisWaybillFeeitemService emisWaybillFeeitemService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemFaqController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemFaqController.java index 1cbc37334..9003b452e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemFaqController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemFaqController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillProblemFaqService; */ @RestController @RequestMapping("/emis/emisWaybillProblemFaq") -public class EmisWaybillProblemFaqController extends BaseController +public class EmisWaybillProblemFaqController extends EmisBaseController { @Autowired private IEmisWaybillProblemFaqService emisWaybillProblemFaqService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemInfoController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemInfoController.java index 3d83295a4..c55102a36 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemInfoController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemInfoController.java @@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillProblemInfoService; */ @RestController @RequestMapping("/emis/emisWaybillProblemInfo") -public class EmisWaybillProblemInfoController extends BaseController +public class EmisWaybillProblemInfoController extends EmisBaseController { @Autowired private IEmisWaybillProblemInfoService emisWaybillProblemInfoService; diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java index b783de4c3..7f6687df4 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java @@ -50,7 +50,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillTransferService; */ @RestController @RequestMapping("/emis/emisWaybillTransfer") -public class EmisWaybillTransferController extends BaseController +public class EmisWaybillTransferController extends EmisBaseController { @Autowired private IEmisWaybillTransferService emisWaybillTransferService;