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 3d5d9d5f1..5135907d7 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 @@ -54,7 +54,7 @@ public class EmisTransProductController extends EmisBaseController /** * 查询运输产品类型列表 */ - @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:list')") @GetMapping("/list") public TableDataInfo list(EmisTransProduct emisTransProduct) { diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 4b7bdcb26..c1e9e1053 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1300,7 +1300,7 @@ and payment_remark like concat('%', #{paymentRemark}, '%') and order_remark like concat('%', #{orderRemark}, '%') - and (a.send_site_code=#{params.privSiteCode} or a.start_site_code=#{params.privSiteCode}) + and (a.send_site_code=#{sendSiteCode} or a.start_site_code=#{sendSiteCode}) and a.remark like concat('%', #{remark}, '%')