diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalTeamOuRelation.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalTeamOuRelation.java index dc37da1..dc66eec 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalTeamOuRelation.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalTeamOuRelation.java @@ -58,9 +58,7 @@ public class OrganizationalTeamOuRelation { private JSONObject extra; protected Date createAt; - protected Long createBy; protected Date updateAt; - protected Long updateBy; @TableField("is_delete") protected Long isDelete = 0L; } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/foundation/impl/OrgUserFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/foundation/impl/OrgUserFoundationServiceImpl.java index ca291a3..7c3ddf8 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/foundation/impl/OrgUserFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/foundation/impl/OrgUserFoundationServiceImpl.java @@ -2,6 +2,7 @@ package cn.axzo.orgmanax.server.orguser.foundation.impl; import cn.axzo.apollo.workspace.api.v2.workspace.req.WorkspaceDetailReq; import cn.axzo.apollo.workspace.api.v2.workspace.resp.WorkspaceDetailResp; +import cn.axzo.orgmanax.dto.common.util.NumberUtil; import cn.axzo.orgmanax.dto.nodeuser.enums.OrgUserStatusEnum; import cn.axzo.orgmanax.dto.orguser.dto.OrgUserDTO; import cn.axzo.orgmanax.dto.orguser.event.OrgUserStatusChangedEvent; @@ -42,6 +43,9 @@ public class OrgUserFoundationServiceImpl implements OrgUserFoundationService { @Override public void batchWithdrawOrQuit(OrgUserWithdrawOrQuitReq req) { OrgUserStatusEnum status; + if (NumberUtil.isNotPositiveNumber(req.getWorkspaceId())) { + return; + } if (req.isUnitUpdate()) { WorkspaceDetailReq workspaceDetailReq = new WorkspaceDetailReq(); workspaceDetailReq.setId(req.getWorkspaceId());