diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java index 2d32881e..d349f242 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java @@ -3,6 +3,8 @@ package cn.axzo.tyr.server.service.impl; import cn.axzo.basics.common.BeanMapper; import cn.axzo.basics.common.util.StopWatchUtil; import cn.axzo.basics.common.util.TreeUtil; +import cn.axzo.framework.domain.web.BizException; +import cn.axzo.framework.domain.web.code.BaseCode; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.pokonyan.config.redis.RedisClient; import cn.axzo.tyr.client.common.enums.FeatureResourceAuthType; @@ -15,11 +17,13 @@ import cn.axzo.tyr.client.model.req.GetFeatureResourceTreeReq; import cn.axzo.tyr.client.model.res.CommonDictResp; import cn.axzo.tyr.client.model.res.FeatureResourceDTO; import cn.axzo.tyr.client.model.res.FeatureResourceTreeNode; +import cn.axzo.tyr.server.common.util.Throws; import cn.axzo.tyr.server.model.ResourcePermission; import cn.axzo.tyr.server.model.ResourcePermissionQueryDTO; import cn.axzo.tyr.server.model.convert.SaasFeatureResourceConvert; import cn.axzo.tyr.server.repository.dao.SaasFeatureResourceDao; import cn.axzo.tyr.server.repository.entity.SaasFeatureResource; +import cn.axzo.tyr.server.service.RoleService; import cn.axzo.tyr.server.service.SaasCommonDictService; import cn.axzo.tyr.server.service.SaasFeatureResourceService; import cn.azxo.framework.common.utils.StringUtils; @@ -44,6 +48,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; import java.util.stream.Collectors; +import static cn.axzo.framework.domain.web.code.BaseCode.BAD_REQUEST; +import static cn.axzo.framework.domain.web.code.BaseCode.SERVER_ERROR; import static cn.axzo.tyr.server.common.constants.CacheConstant.KEY_AUTH_FREE; /** @@ -66,6 +72,8 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic private final SaasFeatureResourceCacheService saasFeatureResourceCacheService; private final SaasCommonDictService saasCommonDictService; + private final PermissionGroupImpl roleService; + @Override public List listNavByIds(List featureIds) { //按需扩展要查询的字段 @@ -310,7 +318,6 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic .list(); List featureIds = featureDescendant.stream().map(SaasFeatureResource::getId).collect(Collectors.toList()); - // 删除自己及自己的子集 featureResourceDao.lambdaUpdate() .eq(BaseEntity::getIsDelete,0) @@ -339,7 +346,7 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic List parallelIds = parallelFeature.stream().map(SaasFeatureResource::getId).collect(Collectors.toList()); int index = parallelIds.indexOf(featureId); Assert.isTrue(index >= 0, "未查询到元素下标"); - Integer offsetIndex = index + offset; + int offsetIndex = index + offset; if (offsetIndex < 0) { offsetIndex = 0; } @@ -409,7 +416,9 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic .eq(SaasFeatureResource::getFeatureCode, featureResource.getFeatureCode()) .eq(BaseEntity::getIsDelete, 0) .one(); - Assert.isTrue(exist != null && !exist.getId().equals(featureResource.getId()), "存在重复的FeatureCode"); + if (exist != null && !exist.getId().equals(featureResource.getId())) { + Throws.bizException(BaseCode.BAD_REQUEST, "菜单: " + featureResource.getFeatureName() + " 存在重复的code"); + } }