diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java index e1bed588..16a19ef5 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java @@ -5,12 +5,8 @@ import com.jjb.saas.system.client.user.request.UserRoleUpdateCmd; import org.qinan.safetyeval.client.api.OrgPositionApi; import org.qinan.safetyeval.client.co.GbsRoleOptionCO; import org.qinan.safetyeval.client.co.OrgPositionCO; -import org.qinan.safetyeval.client.dto.OrgPositionAddCmd; -import org.qinan.safetyeval.client.dto.OrgPositionAssignGbsRoleCmd; -import org.qinan.safetyeval.client.dto.OrgPositionModifyCmd; -import org.qinan.safetyeval.client.dto.OrgPositionPageQuery; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.domain.constant.RoleTypeEnum; import org.qinan.safetyeval.domain.entity.OrgPersonnelEntity; import org.qinan.safetyeval.domain.entity.OrgPositionEntity; import org.qinan.safetyeval.domain.exception.BizException; @@ -169,18 +165,19 @@ public class OrgPositionExecutor implements OrgPositionApi { @Override public SingleResponse> listGbsRoles() { List roles = gbsRoleFacadeClient.listRoles(); - List options = new ArrayList(); - if (roles != null) { - for (RoleCO role : roles) { - if (role == null) { - continue; - } - GbsRoleOptionCO option = new GbsRoleOptionCO(); - option.setRoleId(role.getId()); - option.setRoleCode(role.getRoleCode()); - option.setRoleName(role.getRoleName()); - options.add(option); + List options = new ArrayList<>(); + if (roles == null) { + return SingleResponse.success(options); + } + for (RoleCO role : roles) { + if (role == null || !RoleTypeEnum.GRZHJS.getValue().equals(role.getRoleTypeEnum())) { + continue; } + GbsRoleOptionCO option = new GbsRoleOptionCO(); + option.setRoleId(role.getId()); + option.setRoleCode(role.getRoleCode()); + option.setRoleName(role.getRoleName()); + options.add(option); } return SingleResponse.success(options); } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/RoleTypeEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/RoleTypeEnum.java new file mode 100644 index 00000000..90e1a885 --- /dev/null +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/RoleTypeEnum.java @@ -0,0 +1,18 @@ +package org.qinan.safetyeval.domain.constant; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * 角色类型枚举 + */ +@RequiredArgsConstructor +@Getter +public enum RoleTypeEnum { + GLYJS("GLYJS", "管理员"), + GRZHJS("GRZHJS", "个人账号"); + + private final String value; // 中文描述 + private final String label; // 中文描述 + +}