From 514a5046ae9664ed75189586031337544d36de9b Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 22 May 2024 14:49:00 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/web/emis/EmisCustomerUserController.java | 2 +- .../com/xdadan/erp/web/emis/EmisMonthpayAccountController.java | 3 --- .../erp/emis/service/impl/EmisCustomerUserServiceImpl.java | 2 ++ emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) 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 b7268bac6..7d108b45c 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 @@ -115,7 +115,7 @@ public class EmisCustomerUserController extends BaseController @PostMapping public AjaxResult add(@RequestBody EmisCustomerUser emisCustomerUser) { - emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); +// emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser)); } 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 d546cf0ea..69f36d735 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 @@ -86,9 +86,6 @@ public class EmisMonthpayAccountController extends BaseController List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); return getDataTable(list); -// startPage(); -// List list = emisMonthpayAccountService.selectEmisMonthpayAccountList(emisMonthpayAccount); -// return getDataTable(list); } /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java index 04792c2bf..5e90276d6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java @@ -64,6 +64,8 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi @Override public int insertEmisCustomerUser(EmisCustomerUser emisCustomerUser) { + + EmisCustomerUser crtUser=createCustomerUser(emisCustomerUser); // return emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser); return 1; diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index b8fd24460..7bee01a37 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -104,7 +104,7 @@ del_flag='0' - and owner_site=#{ownerSite} + and ( owner_site=#{ownerSite} or FIND_IN_SET(#{ownerSite},biz_site) ) and customer_name like concat('%', #{custName}, '%')