diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBrandController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBrandController.java index aa3d67bbb..d5ec15544 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBrandController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBrandController.java @@ -63,9 +63,9 @@ public class EmisBrandController extends BaseController return getDataTable(list); } - @PreAuthorize("@ss.hasPermi('emis:emisBrand:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisBrand:list')") @JacksonFilter(include= {"id","code","name","nameEn","logo"},value= EmisBrand.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @GetMapping("/listSimple") + @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisBrand emisBrand) { startPage(); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java index 87d536aca..69caba096 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java @@ -63,9 +63,9 @@ public class EmisCountryController extends BaseController return getDataTable(list); } - @PreAuthorize("@ss.hasPermi('emis:emisCountry:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisCountry:list')") @JacksonFilter(include= {"id","code","name","nameEn","twoCode"},value= EmisCountry.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @GetMapping("/listSimple") + @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisCountry emisCountry) { startPage(); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java index 0e5353bf6..14798e7e9 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java @@ -51,16 +51,17 @@ public class EmisCustomerUserController extends BaseController /** * 查询快递客户用户列表 */ - @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')") @GetMapping("/list") public TableDataInfo list(EmisCustomerUser emisCustomerUser) { startPage(); + emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); return getDataTable(list); } - @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')") @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisCustomerUser emisCustomerUser) { diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java index 86dca774e..8b0624a36 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java @@ -63,9 +63,9 @@ public class EmisRegionController extends BaseController return getDataTable(list); } - @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')") @JacksonFilter(include= {"id","regionCode","regionName","regionNameEn","parentCode"},value= EmisRegion.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @GetMapping("/listSimple") + @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisRegion emisRegion) { if(emisRegion.getRegionType() == null){ diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java index 87ed0cabd..813999906 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java @@ -65,9 +65,9 @@ public class EmisSiteController extends BaseController /** * 查询网点-精简 */ - @PreAuthorize("@ss.hasPermi('emis:emisSite:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisSite:list')") @JacksonFilter(include= {"id","siteCode","siteName","siteNameEn","parentSiteCode","province","provinceName"},value=EmisSite.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @GetMapping("/listSimple") + @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisSite emisSite) { startPage(); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java index 181376885..f9b429a24 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java @@ -66,9 +66,9 @@ public class EmisTransLineController extends BaseController /** * 查询线路列表 -- 精简 */ - @PreAuthorize("@ss.hasPermi('emis:emisTransLine:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisTransLine:list')") @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn"},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @GetMapping("/listSimple") + @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisTransLine emisTransLine) { startPage(); 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 bcb707816..7889cf93a 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 @@ -63,9 +63,9 @@ public class EmisTransProductController extends BaseController return getDataTable(list); } - @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:list')") @JacksonFilter(include= {"id","prodCode","prodName","prodNameEn"},value= EmisTransProduct.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @GetMapping("/listSimple") + @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisTransProduct emisTransProduct) { startPage(); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 1069d23e6..894bfd982 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -121,12 +121,13 @@ public class EmisWaybillController extends BaseController return getDataTable(list); } - @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')") // @JacksonFilter(exclude= {},value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisWaybill emisWaybill) { startPage(); + emisWaybill.setCreateSite(getLoginUser().getUser().getOwnerSiteCode()); List list = emisWaybillService.selectEmisWaybillList(emisWaybill); return getDataTable(list); }