fix(缺陷管理): 详情关联用例部分BUG修复
--bug=1036902 --user=宋昌昌 【缺陷管理】缺陷详情-用例-关联用例-后关联的用例应该显示在顶部 https://www.tapd.cn/55049933/s/1476591 --bug=1036912 --user=宋昌昌 【缺陷管理】缺陷详情-用例-关联用例-左侧搜索模块未匹配模块提示文案修改 https://www.tapd.cn/55049933/s/1476600 --bug=1036913 --user=宋昌昌 【缺陷管理】缺陷详情-用例-关联用例-跨项目关联提示无权限 https://www.tapd.cn/55049933/s/1476604
This commit is contained in:
parent
8fcaf9430e
commit
501a7563ac
|
@ -54,6 +54,7 @@
|
||||||
or fc.num like concat('%', #{request.keyword}, '%')
|
or fc.num like concat('%', #{request.keyword}, '%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
|
order by brc.id desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getRelateCase" resultType="io.metersphere.bug.dto.response.BugRelateCaseDTO">
|
<select id="getRelateCase" resultType="io.metersphere.bug.dto.response.BugRelateCaseDTO">
|
||||||
|
|
|
@ -41,7 +41,7 @@ import java.util.stream.Collectors;
|
||||||
* @author song-cc-rock
|
* @author song-cc-rock
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
@Transactional
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public class ProjectMemberService {
|
public class ProjectMemberService {
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
|
|
|
@ -11,7 +11,9 @@ import io.metersphere.system.dto.permission.PermissionDefinitionItem;
|
||||||
import io.metersphere.system.dto.request.OrganizationUserRoleMemberEditRequest;
|
import io.metersphere.system.dto.request.OrganizationUserRoleMemberEditRequest;
|
||||||
import io.metersphere.system.dto.request.OrganizationUserRoleMemberRequest;
|
import io.metersphere.system.dto.request.OrganizationUserRoleMemberRequest;
|
||||||
import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
|
import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
|
||||||
import io.metersphere.system.mapper.*;
|
import io.metersphere.system.mapper.ExtUserRoleMapper;
|
||||||
|
import io.metersphere.system.mapper.UserRoleMapper;
|
||||||
|
import io.metersphere.system.mapper.UserRoleRelationMapper;
|
||||||
import io.metersphere.system.uid.IDGenerator;
|
import io.metersphere.system.uid.IDGenerator;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
@ -32,16 +34,12 @@ import static io.metersphere.system.controller.result.SystemResultCode.NO_ORG_US
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public class OrganizationUserRoleService extends BaseUserRoleService {
|
public class OrganizationUserRoleService extends BaseUserRoleService {
|
||||||
|
|
||||||
@Resource
|
|
||||||
UserMapper userMapper;
|
|
||||||
@Resource
|
@Resource
|
||||||
UserRoleMapper userRoleMapper;
|
UserRoleMapper userRoleMapper;
|
||||||
@Resource
|
@Resource
|
||||||
ExtUserRoleMapper extUserRoleMapper;
|
ExtUserRoleMapper extUserRoleMapper;
|
||||||
@Resource
|
@Resource
|
||||||
UserRoleRelationMapper userRoleRelationMapper;
|
UserRoleRelationMapper userRoleRelationMapper;
|
||||||
@Resource
|
|
||||||
ExtUserMapper extUserMapper;
|
|
||||||
|
|
||||||
public List<UserRole> list(String organizationId) {
|
public List<UserRole> list(String organizationId) {
|
||||||
UserRoleExample example = new UserRoleExample();
|
UserRoleExample example = new UserRoleExample();
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
v-model:selected-keys="selectedModuleKeys"
|
v-model:selected-keys="selectedModuleKeys"
|
||||||
:data="folderTree"
|
:data="folderTree"
|
||||||
:keyword="moduleKeyword"
|
:keyword="moduleKeyword"
|
||||||
:empty-text="t('caseManagement.featureCase.caseEmptyRecycle')"
|
:empty-text="t('common.noData')"
|
||||||
:virtual-list-props="virtualListProps"
|
:virtual-list-props="virtualListProps"
|
||||||
:field-names="{
|
:field-names="{
|
||||||
title: 'name',
|
title: 'name',
|
||||||
|
|
Loading…
Reference in New Issue