diff --git a/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java b/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java index cd4d192..3f95e65 100644 --- a/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java +++ b/src/main/java/com/weaver/seconddev/portal/entity/param/BaseParam.java @@ -16,7 +16,17 @@ public class BaseParam { private String ec_secondev = "ec_secondev"; private String eteams = "eteams"; + /** + * 部门自定义表 + */ private String table_dept_cus = "ft_1154218872715993098"; + /** + * 岗位自定义表 + */ + private String table_job_cus = "ft_1155455711525494797"; + /** + * 租户标识 + */ private String tenantKey; public String getTenantKey() { diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java index 09f2ec8..140a9bf 100644 --- a/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/portal/service/impl/ManagerPortalServiceImpl.java @@ -348,8 +348,8 @@ public class ManagerPortalServiceImpl implements ManagerPortalService { public WeaResult> getTeamEmployee(Map params) { String searchKey = params.get("searchKey"); String departmentId = params.get("departmentId"); - int pageSize = Convert.toInt(params.get("pageSize"), 1); - int current = Convert.toInt(params.get("current"), 10); + int pageSize = Convert.toInt(params.get("pageSize"), 10); + int current = Convert.toInt(params.get("current"), 1); User currentUser = UserContext.getCurrentUser(); BasicPersonnelParam basicPersonnelParam = new BasicPersonnelParam();