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 9de98df42..7ae50c872 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 @@ -83,12 +83,8 @@ public class EmisTmsScanRecordController extends EmisBaseController { 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()); - } + // 设置通用权限查询参数 + setPrivParams(emisTmsScanRecord); emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode()); List list = emisTmsScanRecordService.queryScanStatList(emisTmsScanRecord); @@ -104,6 +100,9 @@ public class EmisTmsScanRecordController extends EmisBaseController public TableDataInfo queryScanStatRecordList(EmisTmsScanRecord emisTmsScanRecord) { startPage(); + // 设置通用权限查询参数 + setPrivParams(emisTmsScanRecord); + emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode()); List list = emisTmsScanRecordService.queryScanStatRecordList(emisTmsScanRecord); return getDataTable(list); @@ -237,6 +236,10 @@ public class EmisTmsScanRecordController extends EmisBaseController public TableDataInfo list(EmisTmsScanRecord emisTmsScanRecord) { startPage(); + + // 设置通用权限查询参数 + setPrivParams(emisTmsScanRecord); + if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){ String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(","); if(billCodeSortList.length>1){ @@ -264,6 +267,10 @@ public class EmisTmsScanRecordController extends EmisBaseController @PostMapping("/export") public void export(HttpServletResponse response, EmisTmsScanRecord emisTmsScanRecord) { + + // 设置通用权限查询参数 + setPrivParams(emisTmsScanRecord); + List list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord); ExcelUtil util = new ExcelUtil(EmisTmsScanRecord.class); util.exportExcel(response, list, "TMS扫描记录数据"); diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml index 821e9b973..c6cc63c92 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml @@ -271,11 +271,7 @@ and ( - 1=1 - - and scanSiteCode=#{params.privSiteCode} - - + scanSiteCode=#{params.privSiteCode} )