aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-04 19:31:22 +08:00
parent 0d4f42a6ce
commit 95832e6ec2
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
View File

@ -83,12 +83,8 @@ public class EmisTmsScanRecordController extends EmisBaseController
{ {
startPage(); startPage();
if(!getLoginUser().getUser().isTopSite()){ // 设置通用权限查询参数
emisTmsScanRecord.getParams().put("innerQuery","1"); setPrivParams(emisTmsScanRecord);
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()); emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode());
List<ScanStatDataInfo> list = emisTmsScanRecordService.queryScanStatList(emisTmsScanRecord); List<ScanStatDataInfo> list = emisTmsScanRecordService.queryScanStatList(emisTmsScanRecord);
@ -104,6 +100,9 @@ public class EmisTmsScanRecordController extends EmisBaseController
public TableDataInfo queryScanStatRecordList(EmisTmsScanRecord emisTmsScanRecord) public TableDataInfo queryScanStatRecordList(EmisTmsScanRecord emisTmsScanRecord)
{ {
startPage(); startPage();
// 设置通用权限查询参数
setPrivParams(emisTmsScanRecord);
emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode()); emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode());
List<EmisTmsScanRecord> list = emisTmsScanRecordService.queryScanStatRecordList(emisTmsScanRecord); List<EmisTmsScanRecord> list = emisTmsScanRecordService.queryScanStatRecordList(emisTmsScanRecord);
return getDataTable(list); return getDataTable(list);
@ -237,6 +236,10 @@ public class EmisTmsScanRecordController extends EmisBaseController
public TableDataInfo list(EmisTmsScanRecord emisTmsScanRecord) public TableDataInfo list(EmisTmsScanRecord emisTmsScanRecord)
{ {
startPage(); startPage();
// 设置通用权限查询参数
setPrivParams(emisTmsScanRecord);
if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){ if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){
String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(","); String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(",");
if(billCodeSortList.length>1){ if(billCodeSortList.length>1){
@ -264,6 +267,10 @@ public class EmisTmsScanRecordController extends EmisBaseController
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, EmisTmsScanRecord emisTmsScanRecord) public void export(HttpServletResponse response, EmisTmsScanRecord emisTmsScanRecord)
{ {
// 设置通用权限查询参数
setPrivParams(emisTmsScanRecord);
List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord); List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord);
ExcelUtil<EmisTmsScanRecord> util = new ExcelUtil<EmisTmsScanRecord>(EmisTmsScanRecord.class); ExcelUtil<EmisTmsScanRecord> util = new ExcelUtil<EmisTmsScanRecord>(EmisTmsScanRecord.class);
util.exportExcel(response, list, "TMS扫描记录数据"); util.exportExcel(response, list, "TMS扫描记录数据");

6
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -271,11 +271,7 @@
<if test="params.isPrivQuery != null and params.isPrivQuery ='T'"> <if test="params.isPrivQuery != null and params.isPrivQuery ='T'">
and ( and (
1=1 scanSiteCode=#{params.privSiteCode}
<if test="params.privSiteCode != null">
and scanSiteCode=#{params.privSiteCode}
</if>
) )
</if> </if>