From ad9e80e1e87304967f3e944805093b1363de7044 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 5 Aug 2024 14:56:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B9=E7=BB=93=E7=82=B9=E6=A0=91?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/entity/chart/CompanyTreePO.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/com/engine/organization/entity/chart/CompanyTreePO.java b/src/com/engine/organization/entity/chart/CompanyTreePO.java index c5c3dd1e..e002c8d0 100644 --- a/src/com/engine/organization/entity/chart/CompanyTreePO.java +++ b/src/com/engine/organization/entity/chart/CompanyTreePO.java @@ -22,6 +22,7 @@ public class CompanyTreePO { private boolean isLeaf; private String key; private boolean disabled; + private String type; public boolean getIsLeaf() { return isLeaf; @@ -38,4 +39,11 @@ public class CompanyTreePO { public String getValue() { return id; } + + public String getType() { + if(id.startsWith("d")){ + return "2"; + } + return "1"; + } } From be807d032bb645ae11f45adaf51ac7e69ccdf99f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 5 Aug 2024 15:11:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=96=E5=88=B6=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E3=80=81=E7=BC=96=E5=88=B6=E4=BF=A1=E6=81=AF=E5=88=86=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/StaffPlanServiceImpl.java | 7 +++++++ .../engine/organization/service/impl/StaffServiceImpl.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index e1206971..70fda66e 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -17,6 +17,7 @@ import com.engine.organization.util.*; import com.engine.organization.util.browser.OrganizationBrowserUtil; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; +import com.engine.organization.util.detach.DetachUtil; import org.apache.commons.lang3.StringUtils; import weaver.common.DateUtil; import weaver.conn.RecordSet; @@ -284,6 +285,12 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { if (null != forbiddenTag) { sqlWhere += " AND t.forbidden_tag = '" + forbiddenTag + "'"; } + // 分权 + DetachUtil detachUtil = new DetachUtil(user); + if (detachUtil.isDETACH()) { + String ids = detachUtil.getJclRoleLevels(); + sqlWhere += " AND t.ec_company in (" + ids + ")"; + } return sqlWhere; } } diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 164a1820..81fa3b23 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -30,6 +30,7 @@ import com.engine.organization.util.*; import com.engine.organization.util.browser.OrganizationBrowserUtil; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; +import com.engine.organization.util.detach.DetachUtil; import com.engine.organization.util.excel.ExcelUtil; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -437,6 +438,12 @@ public class StaffServiceImpl extends Service implements StaffService { sqlWhere += " AND t.plan_id in ( select id from jcl_org_staffplan where plan_name " + dbType.like(staffName) + ") "; } + // 分权 + DetachUtil detachUtil = new DetachUtil(user); + if (detachUtil.isDETACH()) { + String ids = detachUtil.getJclRoleLevels(); + sqlWhere += " AND t.ec_company in (" + ids + ")"; + } return sqlWhere; }