diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java index c84d14ea3..5244f7086 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java @@ -66,13 +66,9 @@ public class EmisCustomerAddressController extends BaseController { // 需要限制,除总部外,只能查看站点自有数据 startPage(); -// if(!getLoginUser().getUser().isTopSite()) { -// } - if(StringUtils.isEmpty(emisCustomerAddress.getUseSiteCode())) { emisCustomerAddress.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode()); } - List list = emisCustomerAddressService.selectEmisCustomerAddressList(emisCustomerAddress); return getDataTable(list); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java index c46e1f4d0..0eb2ba270 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java @@ -69,6 +69,8 @@ public class EmisCustomerAddressServiceImpl extends EmisBaseService implements I emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode()); emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName()); + + // 创建用户 return emisCustomerAddressMapper.insertEmisCustomerAddress(emisCustomerAddress); } diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml index d0f651bc8..82ba00903 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml @@ -58,10 +58,10 @@ and prod_name_en like concat('%', #{prodNameEn}, '%') and status = #{status} and country like concat('%', #{country}, '%') - and trans_line_code like concat('%', #{transLineCode}, '%') + and trans_line_code=#{transLineCode} and trans_line like concat('%', #{transLine}, '%') - and carry_type like concat('%', #{carryType}, '%') - and trans_type like concat('%', #{transType}, '%') + and carry_type=#{carryType} + and trans_type=#{transType} and aging_desc like concat('%', #{agingDesc}, '%') and min_aging = #{minAging} and max_aging = #{maxAging}