diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index 0f30bbed..b1694c47 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -70,8 +70,8 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ * extend_group */ private static final Long COMPANY_TYPE = 1L; - private static final Long DEPARTMENT_TYPE = 1L; - private static final Long JOB_TYPE = 1L; + private static final Long DEPARTMENT_TYPE = 2L; + private static final Long JOB_TYPE = 3L; private ExtendInfoMapper getExtendInfoMapper() { diff --git a/src/com/engine/organization/util/HasRightUtil.java b/src/com/engine/organization/util/HasRightUtil.java index dfb08ed6..7e93ce4b 100644 --- a/src/com/engine/organization/util/HasRightUtil.java +++ b/src/com/engine/organization/util/HasRightUtil.java @@ -20,7 +20,7 @@ public class HasRightUtil { * @return */ public static boolean hasRight(User user, String rightName, boolean isReturnFalse) { - boolean hasRight = HrmUserVarify.checkUserRight("Scheme:All", user); + boolean hasRight = HrmUserVarify.checkUserRight(rightName, user); if (!isReturnFalse) { OrganizationAssert.isTrue(hasRight, "暂无权限访问"); }