From 2c10a647cdce9244daef3d90d29a2c43c2dcdd43 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 15 May 2024 08:12:40 +0800 Subject: [PATCH] md --- .../java/com/xdadan/erp/web/emis/EmisStaffController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java index 2ba5fd2cc..f5b31af23 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java @@ -64,7 +64,7 @@ public class EmisStaffController extends BaseController // @PreAuthorize("@ss.hasPermi('system:user:list')") @JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @RequestMapping("/getStaffList") - public TableDataInfo getStaffList(String postCode,String empCode,String searchValue) + public TableDataInfo getStaffList(String postCode,String empCode,String ownerSiteCode,String searchValue) { SysUser queryUser = new SysUser(); @@ -84,9 +84,8 @@ public class EmisStaffController extends BaseController } // 总部可以查看所有，其他站点只能看自己的员工 - SysUser currentUser = getLoginUser().getUser(); - if(!currentUser.isTopSite()) { - queryUser.setOwnerSiteCode(currentUser.getOwnerSiteCode()); + if(StringUtils.isEmpty(ownerSiteCode)) { + queryUser.setOwnerSiteCode( getLoginUser().getUser().getOwnerSiteCode()); } queryUser.setSearchValue(searchValue);