md

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: <p> 品牌 控制器 </p>
+ */
+
+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){
+
+            }
+        }
+
+    }
+
+}

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;

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

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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<ScanStatDataInfo> list = emisTmsScanRecordService.queryScanStatList(emisTmsScanRecord);
         return getDataTable(list);

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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");
+        setPrivParams(emisWaybill);
-            emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode());
-            emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
-            emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
-        }
 
         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");
+        setPrivParams(emisWaybill);
-            emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode());
-            emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
-            emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
-        }
 
         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());
+        setPrivParams(emisWaybill);
-            emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
-            emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
-        }
 
         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());
+        setPrivParams(emisWaybill);
-            emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
-            emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
-        }
 
         if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
             String[] billCodeSortList = emisWaybill.getBillCode().split(",");

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;

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;

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;

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;