From 786b5b76fee42107cef33892cbf7e3e8fab4f0e4 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期一, 06 十一月 2023 23:36:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java index c9b088b..9ede4ec 100644 --- a/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java +++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java @@ -25,10 +25,11 @@ public void pageData(Page<OAStaff> page, Map<String, Object> param) throws Exception { - String hql = " from " + OAStaff.class.getName() + " where companyId=:companyId"; + String hql = " from " + OAStaff.class.getName() + " where companyId =:companyId and deptId =:deptId"; Map<String, Object> args = new HashMap<>(); args.put("companyId", ContextUtil.getCompanyId()); + args.put("deptId", ContextUtil.subDeptId(null)); if (null != param) { -- Gitblit v1.9.3