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

Merge branch 'hotfix/20250324' into 'master'

Browse Source 
Hotfix/20250324

See merge request universal/infrastructure/backend/tyr!441
This commit is contained in:
罗福 2025-03-24 10:28:52 +00:00
commit 393dd2f2d2
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tyr-server/src/main/java/cn/axzo/tyr/server/controller/PrivateController.java
View File

@ -46,6 +46,7 @@ import cn.axzo.tyr.server.repository.dao.SaasPgroupRoleRelationDao;
import cn.axzo.tyr.server.repository.dao.SaasRoleDao; import cn.axzo.tyr.server.repository.dao.SaasRoleDao;
import cn.axzo.tyr.server.repository.dao.SaasRoleGroupDao; import cn.axzo.tyr.server.repository.dao.SaasRoleGroupDao;
import cn.axzo.tyr.server.repository.dao.SaasRoleGroupRelationDao; import cn.axzo.tyr.server.repository.dao.SaasRoleGroupRelationDao;
import cn.axzo.tyr.server.repository.dao.SaasRoleUserRelationDao;
import cn.axzo.tyr.server.repository.entity.SaasFeature; import cn.axzo.tyr.server.repository.entity.SaasFeature;
import cn.axzo.tyr.server.repository.entity.SaasFeatureResource; import cn.axzo.tyr.server.repository.entity.SaasFeatureResource;
import cn.axzo.tyr.server.repository.entity.SaasPageElement; import cn.axzo.tyr.server.repository.entity.SaasPageElement;
@ -71,8 +72,10 @@ import cn.axzo.tyr.server.service.WorkspaceProductService;
import cn.axzo.tyr.server.service.impl.SaasFeatureResourceCacheService; import cn.axzo.tyr.server.service.impl.SaasFeatureResourceCacheService;
import cn.axzo.tyr.server.util.FeatureCodeUtil; import cn.axzo.tyr.server.util.FeatureCodeUtil;
import cn.azxo.framework.common.utils.StringUtils; import cn.azxo.framework.common.utils.StringUtils;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -143,6 +146,7 @@ public class PrivateController {
private final RoleSaasFeatureResourceCacheService roleSaasFeatureResourceCacheService; private final RoleSaasFeatureResourceCacheService roleSaasFeatureResourceCacheService;
private final SendDingTalkHandler sendDingTalkHandler; private final SendDingTalkHandler sendDingTalkHandler;
private final ProductSaasFeatureResourceCacheService productSaasFeatureResourceCacheService; private final ProductSaasFeatureResourceCacheService productSaasFeatureResourceCacheService;
private final SaasRoleUserRelationDao saasRoleUserRelationDao;
/** /**
* 统一层级的roleGroup按照id升序，sort从1递增 * 统一层级的roleGroup按照id升序，sort从1递增
@ -1355,6 +1359,21 @@ public class PrivateController {
return "ok"; return "ok";
} }
/**
* 清洗saas_role_user_relation数据
*/
@PostMapping("/api/private/role/user/relation/delete")
public Object deleteSaasRoleUserRelation(@RequestBody JSONObject param) {
List<Long> ids = param.getJSONArray("ids").stream()
.map(s -> Long.valueOf(s.toString()))
.distinct()
.collect(Collectors.toList());
if (CollUtil.isNotEmpty(ids)) {
saasRoleUserRelationDao.deleteById(ids);
}
return "ok";
}
@Data @Data
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor