From 7e8a9f2556e60c7d95446d0871b5405731a8c11f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 17 Aug 2023 17:10:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E7=BA=A7=E3=80=81=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=88=86=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/service/impl/LevelServiceImpl.java | 7 +++++++ .../organization/service/impl/SequenceServiceImpl.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 92804165..d15702c0 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -19,6 +19,7 @@ import com.engine.organization.service.LevelService; import com.engine.organization.util.*; 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.conn.RecordSet; import weaver.general.StringUtil; @@ -213,6 +214,12 @@ public class LevelServiceImpl extends Service implements LevelService { if (StringUtils.isNotBlank(viewCondition) && !"-1".equalsIgnoreCase(viewCondition)) { sqlWhere += " AND t.forbidden_tag = '" + viewCondition + "'"; } + + DetachUtil detachUtil = new DetachUtil(user); + if (detachUtil.isDETACH()) { + String jclRoleLevels = detachUtil.getJclRoleLevels(); + sqlWhere += " and s.subcompanyid in (" + jclRoleLevels + ")"; + } return sqlWhere; } diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index 402c14d6..2a0a9271 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -18,6 +18,7 @@ import com.engine.organization.service.SequenceService; import com.engine.organization.util.*; 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.conn.RecordSet; import weaver.general.StringUtil; @@ -212,6 +213,12 @@ public class SequenceServiceImpl extends Service implements SequenceService { if (StringUtils.isNotBlank(viewCondition) && !"-1".equalsIgnoreCase(viewCondition)) { sqlWhere += " AND t.forbidden_tag = '" + viewCondition + "'"; } + + DetachUtil detachUtil = new DetachUtil(user); + if (detachUtil.isDETACH()) { + String jclRoleLevels = detachUtil.getJclRoleLevels(); + sqlWhere += " and s.subcompanyid in (" + jclRoleLevels + ")"; + } return sqlWhere; }