wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:(REQ-2227) 修改角色分组查询的bug

Browse Source
This commit is contained in:
lilong 2024-04-23 19:08:24 +08:00
parent a959be8552
commit e8caebbd47
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tyr-server/src/main/java/cn/axzo/tyr/server/config/FeignConfig.java
View File

@ -22,7 +22,7 @@ import java.util.Objects;
**/
@Component
@Slf4j
@Profile({"dev", "local"})
@Profile({"dev", "test", "local", "pre", "live"})
public class FeignConfig implements RequestInterceptor, EnvironmentAware {
private Environment environment;
@Value("${msgCenterEnvUrl:http://dev-app.axzo.cn/msg-center}")
@ -61,6 +61,12 @@ public class FeignConfig implements RequestInterceptor, EnvironmentAware {
if(Objects.equals(profile, "test") && url.contains("dev-app.axzo.cn")) {
url = url.replace("dev-app", "test-api");
}
if(Objects.equals(profile, "pre") && url.contains("dev-app.axzo.cn")) {
url = url.replace("dev-app", "pre-api");
}
if(Objects.equals(profile, "live") && url.contains("dev-app.axzo.cn")) {
url = url.replace("dev-app", "live-api");
}
requestTemplate.target(url);
Field field = ReflectUtil.getField(target.getClass(), "url");
field.setAccessible(true);

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java
View File

@ -177,7 +177,7 @@ public class SaasRoleGroupServiceImpl extends ServiceImpl<SaasRoleGroupMapper, S
@Override
public List<SaasRoleGroupVO> listByCategoryCode(List<String> categoryCode) {
return BeanUtil.copyToList(this.listByCodes(categoryCode, 3), SaasRoleGroupVO.class);
return BeanUtil.copyToList(this.listByCodes(categoryCode, 2), SaasRoleGroupVO.class);
}
private void assembleSort(SaasRoleGroup saasRoleGroup) {