This commit is contained in:
linfso 2024-05-21 07:37:13 +08:00
parent b471737bb0
commit eddef42593

View File

@ -236,15 +236,15 @@ public class EmisWaybillController extends BaseController
@RequestMapping("/list") @RequestMapping("/list")
public TableDataInfo list(EmisWaybill emisWaybill) public TableDataInfo list(EmisWaybill emisWaybill)
{ {
// 非总部只能查看自己的或者与自己相关的订单 // 非总部只能查看自己的或者与自己相关的订单
startPage();
if(!getLoginUser().getUser().isTopSite()){ if(!getLoginUser().getUser().isTopSite()){
emisWaybill.getParams().put("innerQuery","1"); emisWaybill.getParams().put("innerQuery","1");
emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode()); emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode());
emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode()); emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
} }
startPage();
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }
@ -269,7 +269,12 @@ public class EmisWaybillController extends BaseController
public TableDataInfo listSimple(EmisWaybill emisWaybill) public TableDataInfo listSimple(EmisWaybill emisWaybill)
{ {
startPage(); startPage();
// emisWaybill.setCreateSite(getLoginUser().getUser().getOwnerSiteCode()); 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());
}
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }
@ -281,7 +286,12 @@ public class EmisWaybillController extends BaseController
public TableDataInfo queryPrintListSimple(EmisWaybill emisWaybill) public TableDataInfo queryPrintListSimple(EmisWaybill emisWaybill)
{ {
startPage(); startPage();
// emisWaybill.setCreateSite(getLoginUser().getUser().getOwnerSiteCode()); 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());
}
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }