test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(个人中心): 修复个人中心数据显示问题 

【【个人中心】有组织无项目不显示组织】
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001035521
This commit is contained in:
song-tianyang 2024-02-22 15:38:10 +08:00 committed by Craftsman
parent 193aa7032c
commit 5df3ca1d19
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/services/api-test/src/main/java/io/metersphere/api/dto/mockserver/KeyValueInfo.java
View File

@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@Data @Data
@ -56,10 +55,7 @@ public class KeyValueInfo {
} }
} else if (StringUtils.equals(this.condition, ParamConditionEnums.REGULAR_MATCH.name())) { } else if (StringUtils.equals(this.condition, ParamConditionEnums.REGULAR_MATCH.name())) {
try { try {
Pattern pattern = Pattern.compile(value); return this.value.matches(Pattern.quote(value));
Matcher matcher = pattern.matcher(this.value);
boolean isMatch = matcher.matches();
return isMatch;
} catch (Exception e) { } catch (Exception e) {
return false; return false;
} }

9
backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java
View File

@ -139,15 +139,10 @@ public class UserRoleRelationService {
for (UserRoleRelation userRoleRelation : userRoleRelationList) { for (UserRoleRelation userRoleRelation : userRoleRelationList) {
Organization organization = organizationMapper.selectByPrimaryKey(userRoleRelation.getOrganizationId()); Organization organization = organizationMapper.selectByPrimaryKey(userRoleRelation.getOrganizationId());
if (organization != null) { if (organization != null) {
returnMap.computeIfAbsent(organization, k -> new ArrayList<>());
Project project = projectMapper.selectByPrimaryKey(userRoleRelation.getSourceId()); Project project = projectMapper.selectByPrimaryKey(userRoleRelation.getSourceId());
if (project != null) { if (project != null) {
if (returnMap.containsKey(organization)) { returnMap.get(organization).add(project);
if (!returnMap.get(organization).contains(project)) {
returnMap.get(organization).add(project);
}
} else {
returnMap.put(organization, new ArrayList<>(Arrays.asList(project)));
}
} }
} }
} }