cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade

dev-tmp1
luotaiqian 2026-08-11 10:18:17 +08:00
parent 9239222b91
commit cfcc47bc84
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPositionExecutor.java
View File

@ -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.api.OrgPositionApi;
import org.qinan.safetyeval.client.co.GbsRoleOptionCO; import org.qinan.safetyeval.client.co.GbsRoleOptionCO;
import org.qinan.safetyeval.client.co.OrgPositionCO; import org.qinan.safetyeval.client.co.OrgPositionCO;
import org.qinan.safetyeval.client.dto.OrgPositionAddCmd; import org.qinan.safetyeval.client.dto.*;
import org.qinan.safetyeval.client.dto.OrgPositionAssignGbsRoleCmd; import org.qinan.safetyeval.domain.constant.RoleTypeEnum;
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.domain.entity.OrgPersonnelEntity; import org.qinan.safetyeval.domain.entity.OrgPersonnelEntity;
import org.qinan.safetyeval.domain.entity.OrgPositionEntity; import org.qinan.safetyeval.domain.entity.OrgPositionEntity;
import org.qinan.safetyeval.domain.exception.BizException; import org.qinan.safetyeval.domain.exception.BizException;
@ -169,10 +165,12 @@ public class OrgPositionExecutor implements OrgPositionApi {
@Override @Override
public SingleResponse<List<GbsRoleOptionCO>> listGbsRoles() { public SingleResponse<List<GbsRoleOptionCO>> listGbsRoles() {
List<RoleCO> roles = gbsRoleFacadeClient.listRoles(); List<RoleCO> roles = gbsRoleFacadeClient.listRoles();
List<GbsRoleOptionCO> options = new ArrayList<GbsRoleOptionCO>(); List<GbsRoleOptionCO> options = new ArrayList<>();
if (roles != null) { if (roles == null) {
return SingleResponse.success(options);
}
for (RoleCO role : roles) { for (RoleCO role : roles) {
if (role == null) { if (role == null || !RoleTypeEnum.GRZHJS.getValue().equals(role.getRoleTypeEnum())) {
continue; continue;
} }
GbsRoleOptionCO option = new GbsRoleOptionCO(); GbsRoleOptionCO option = new GbsRoleOptionCO();
@ -181,7 +179,6 @@ public class OrgPositionExecutor implements OrgPositionApi {
option.setRoleName(role.getRoleName()); option.setRoleName(role.getRoleName());
options.add(option); options.add(option);
} }
}
return SingleResponse.success(options); return SingleResponse.success(options);
} }

18
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/RoleTypeEnum.java Normal file
View File

@ -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; // 中文描述
}