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 289036d24..f1b0d1ea8 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 @@ -56,10 +56,7 @@ public class EmisCustomerUserController extends BaseController public TableDataInfo list(EmisCustomerUser emisCustomerUser) { startPage(); - if(!"88888".equals(getLoginUser().getUser().getOwnerSiteCode())) { - emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); - } - + emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); return getDataTable(list); } @@ -69,9 +66,7 @@ public class EmisCustomerUserController extends BaseController public TableDataInfo listSimple(EmisCustomerUser emisCustomerUser) { startPage(); - if(!"88888".equals(getLoginUser().getUser().getOwnerSiteCode())) { - emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); - } + emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); return getDataTable(list); } @@ -85,6 +80,7 @@ public class EmisCustomerUserController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, EmisCustomerUser emisCustomerUser) { + emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); ExcelUtil util = new ExcelUtil(EmisCustomerUser.class); util.exportExcel(response, list, "快递客户用户数据"); @@ -108,7 +104,7 @@ public class EmisCustomerUserController extends BaseController @PostMapping public AjaxResult add(@RequestBody EmisCustomerUser emisCustomerUser) { - + emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser)); } diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index cf83105bc..29dcb6fc0 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -158,6 +158,17 @@ and update_time = #{updateTime} and create_site like concat('%', #{createSite}, '%') and update_site like concat('%', #{updateSite}, '%') + + + + AND owner_site in ( + SELECT t1.site_code FROM ( + SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid := + #{ownerSite} ) pd + WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code) + ) + + order by create_time desc