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; }