test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-02 03:58:33 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

feat(个人中心): 切换组织功能

Browse Source
This commit is contained in:
song-cc-rock 2023-12-01 17:06:29 +08:00 committed by Craftsman
parent 1a8b1cc1f5
commit 4229848d70
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/services/system-setting/src/main/java/io/metersphere/system/dto/OrganizationSwitchRequest.java Normal file
View File

@ -0,0 +1,17 @@
package io.metersphere.system.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lombok.Data;
@Data
public class OrganizationSwitchRequest {
@Schema(description = "组织ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{organization.id.not_blank}")
@Size(min = 1, max = 50, message = "{organization.id.length_range}")
private String organizationId;
@Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{user.id.not_blank}")
private String userId;
}

11
backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.java
View File

@ -1,11 +1,11 @@
package io.metersphere.system.mapper;
import io.metersphere.system.dto.sdk.OptionDTO;
import io.metersphere.system.dto.user.UserExtendDTO;
import io.metersphere.system.domain.User;
import io.metersphere.system.dto.*;
import io.metersphere.system.dto.request.OrganizationDeleteRequest;
import io.metersphere.system.dto.request.OrganizationRequest;
import io.metersphere.system.dto.sdk.OptionDTO;
import io.metersphere.system.dto.user.UserExtendDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -107,4 +107,11 @@ public interface ExtOrganizationMapper {
* @return 组织下拉选项
*/
List<OptionDTO> getOptionsByIds(@Param("ids") List<String> ids);
/**
* 获取用户关联组织ID
* @param userId 用户ID
* @return 用户ID集合
*/
List<String> getRelatedOrganizationIds(@Param("userId") String userId);
}

6
backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml
View File

@ -131,6 +131,12 @@
</foreach>
</select>
<select id="getRelatedOrganizationIds" resultType="java.lang.String">
select distinct o.id
from user_role_relation urr join organization o on urr.organization_id = o.id
where user_id = #{userId}
</select>
<sql id="queryWhereCondition">
<where>
<if test="request.keyword != null">