diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java index 70bea4ef6..d546cf0ea 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java @@ -79,7 +79,9 @@ public class EmisMonthpayAccountController extends BaseController public TableDataInfo listSimple(EmisCustomerUser emisCustomerUser) { startPage(); - emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); + if(!getLoginUser().getUser().isTopSite()) { + emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); + } emisCustomerUser.setCustomerType("2"); List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); return getDataTable(list); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 7f02f11b2..faa2693ed 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -311,15 +311,15 @@ public class EmisBaseService { String parcelQty="0"; if(waybill.getParcelQty()!=null){ - parcelQty=waybill.getParcelQty().toString() + parcelQty=waybill.getParcelQty().toString(); } if(waybill.getBillWeight()!=null){ - billWeight=waybill.getBillWeight().stripTrailingZeros().toPlainString() + billWeight=waybill.getBillWeight().stripTrailingZeros().toPlainString(); } if(waybill.getTotalVolume()!=null){ - totalVolume=waybill.getTotalVolume().stripTrailingZeros().toPlainString() + totalVolume=waybill.getTotalVolume().stripTrailingZeros().toPlainString(); }