Commit Graph

1423 Commits

Author SHA1 Message Date
周敏
78fae7fb16 feat:(REQ-2993) 数据权限调整 step2 调整enumerate的枚举值
1、增加 包含班组/不包含班组 的纬度
2、调整之前的数据权限选项
2024-11-06 19:58:47 +08:00
周敏
b37690a476 feat:(REQ-2993) 数据权限调整
1、增加 包含班组/不包含班组 的纬度
2、调整之前的数据权限选项
2024-11-06 18:28:43 +08:00
lilong
181a7becdd feat: (feature/REQ-2595) 增加用户角色分页接口 2024-11-05 13:37:36 +08:00
lilong
62313202f7 feat: (feature/REQ-2595) 修改权限查询支持tags过滤 2024-11-04 20:16:31 +08:00
lilong
0e3aa801fa feat: (feature/REQ-2595) 修改权限相关接口支持tags查询 2024-11-04 15:57:53 +08:00
lilong
8bb439593b Merge remote-tracking branch 'origin/master' into feature/REQ-2595
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
2024-11-04 14:51:13 +08:00
lilong
62da7a00d2 feat: (feature/REQ-2595) 修改更新菜单角色时的bug 2024-11-01 14:58:43 +08:00
lilong
0eb7bcd5bb feat: (feature/REQ-2595) 修改角色权限时,增加更新操作 2024-10-31 17:33:04 +08:00
lilong
9c34e9cd89 feat: (feature/REQ-2595) 修改角色权限时,增加更新操作 2024-10-31 17:14:22 +08:00
lilong
eab3cb770c feat: (feature/REQ-2595) 修改角色修改权限 2024-10-30 21:00:01 +08:00
金海洋
7ef955f06e Merge branch 'release-20241030' into 'master'
feat(REQ-3010): SaasPositionEnum调整

See merge request universal/infrastructure/backend/tyr!278
2024-10-30 08:49:32 +00:00
lilong
b69d774ff8 feat: merge 2024-10-30 15:06:19 +08:00
lilong
dbc716ce2e Merge remote-tracking branch 'origin/feature/REQ-3010' into release-20241030
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/pom.xml
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserRelationService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
#	tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml
2024-10-30 15:00:07 +08:00
lilong
05b0590605 feat: (feature/REQ-2595) 菜单管理编辑角色权限增加角色权限标签 2024-10-29 16:06:59 +08:00
lilong
69da738ffb feat: (feature/REQ-2595) 菜单管理编辑角色权限增加角色权限标签 2024-10-29 16:01:31 +08:00
lilong
714022be90 feat: (feature/REQ-2595) 菜单组件详情增加tags,保存预设角色、菜单权限增加tags 2024-10-28 17:34:54 +08:00
李龙
afa65a1ebd Merge branch 'release/20241028' into 'master'
feat: (feature/REQ-2750) 1、解决组件资源更新时groupCode被覆盖成code的问题

See merge request universal/infrastructure/backend/tyr!273
2024-10-28 07:55:24 +00:00
lilong
9ebfdd6f75 feat: merge 2024-10-28 11:21:55 +08:00
lilong
15fdf458df Merge remote-tracking branch 'origin/feature/REQ-3034' into release/20241028
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
2024-10-28 11:19:39 +08:00
lilong
e4ecfd3fd1 Merge remote-tracking branch 'origin/feature/REQ-2750-1' into release/20241028
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
2024-10-28 11:16:23 +08:00
李龙
f83d6c1331 Merge branch 'feature/REQ-2750' into 'release/20241028'
feat: (feature/REQ-2750) 1、解决组件资源更新时groupCode被覆盖成code的问题

See merge request universal/infrastructure/backend/tyr!270
2024-10-28 03:10:39 +00:00
lilong
8ab50f4cb9 feat: (feature/REQ-2595) 角色查询、菜单查询支持权限tags过滤 2024-10-28 10:53:13 +08:00
lilong
0d18367995 Merge branch 'hotfix/20241021' into feature/REQ-2595 2024-10-28 10:48:52 +08:00
lilong
2051e761df feat: (feature/REQ-2750) 修改同步菜单时支持同步权限标签 2024-10-25 15:18:04 +08:00
lilong
784db6f298 feat: (feature/REQ-2750) 1、解决组件资源更新时groupCode被覆盖成code的问题
2、解决查询项目下有权限的人无法查询出admin角色的人的问题
2024-10-25 11:01:52 +08:00
lilong
19ae1ee0d0 Merge remote-tracking branch 'origin/master' into feature/REQ-2750
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
2024-10-25 10:45:25 +08:00
lilong
ad7224a332 feat: (feature/REQ-2595) 修改项目下有权限的人支持权限标签过滤 2024-10-25 10:40:24 +08:00
lilong
9a9ab39fcc feat: (feature/REQ-2595) 修改查询用户有权限的菜单资源支持权限标签过滤 2024-10-24 16:46:10 +08:00
lilong
65363b6e48 feat: (feature/REQ-2595) 修改鉴权接口支持普通角色、管理员角色的权限标签过滤 2024-10-24 13:56:25 +08:00
lilong
3c06ee73eb Merge remote-tracking branch 'origin/feature/REQ-2595' into feature/REQ-2595
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/event/inner/CacheRolePermissionHandler.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
2024-10-24 10:02:50 +08:00
lilong
1494412969 feat: (feature/REQ-2595) 角色权限缓存增加tags, 2024-10-22 18:54:11 +08:00
lilong
f3efb695e9 feat: (hotfix/20241021) 优化菜单节点详情接口,提高接口性能 2024-10-21 15:47:34 +08:00
lilong
f10a3a91f3 feat: (feature/REQ-3010) 迁移pudge saasfeature
相关接口
2024-10-17 15:46:12 +08:00
李龙
3e80c801c9 Merge branch 'release/20241016' into 'master'
Release/20241016

See merge request universal/infrastructure/backend/tyr!260
2024-10-16 10:25:46 +00:00
lilong
2ae3650cd4 Merge remote-tracking branch 'origin/feature/REQ-3068' into release/20241016 2024-10-16 16:13:35 +08:00
lilong
540a7710ba Merge remote-tracking branch 'origin/feature/REQ-2968' into release/20241016
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureResourceService.java
2024-10-16 16:13:18 +08:00
lilong
0a3813338a feat: (feature/REQ-3010) 迁移pudge saasfeature
相关接口
2024-10-16 13:37:04 +08:00
lilong
98f11500ba feat: (feature/REQ-3010) 迁移pudge saasfeature
相关接口
2024-10-16 10:16:34 +08:00
lilong
c666edfaa6 feat: (feature/REQ-3010) 迁移pudge saasfeature
相关接口
2024-10-15 17:15:03 +08:00
chenwenjian
60859f99c5 Merge remote-tracking branch 'origin/feature/REQ-3010' into feature/REQ-3010 2024-10-14 19:57:35 +08:00
chenwenjian
d327cb7735 feat(REQ-3010): 请求方式调整 2024-10-14 19:57:26 +08:00
lilong
ab6c9365c5 feat: (feature/REQ-3010) 迁移pudge代码 2024-10-14 19:46:18 +08:00
chenwenjian
de0b6d1b80 feat(REQ-3010): 请求类型调整 2024-10-14 19:40:56 +08:00
chenwenjian
3eaa81f435 feat(REQ-3010): 新增getUserRoleExListMapByIdentityIdAndWorkspaceId接口
cn.axzo.tyr.client.feign.SaasRoleApi#getUserRoleExListMapByIdentityIdAndWorkspaceId
2024-10-14 18:09:10 +08:00
lilong
7a43be540c feat: (feature/REQ-3010) 迁移超管查询接口 2024-10-14 11:09:27 +08:00
lilong
18605180ce feat: (feature/REQ-3010) 迁移超管查询接口 2024-10-14 10:07:07 +08:00
lilong
abc4445fec feat: (feature/REQ-3034) 修改临时接口支持已删除和未删除的同时查询 2024-10-14 09:53:22 +08:00
chenwenjian
3501abf019 feat(REQ-3010): 还原basics-auth-api依赖引用 2024-10-14 09:30:33 +08:00
lilong
c99fe23c65 feat: (feature/REQ-2750-1) 修改超管角色查询 2024-10-12 18:37:26 +08:00
lilong
bed47b058b feat: (feature/REQ-3034) 修改临时接口支持一直要查询未删除用户 2024-10-12 18:12:03 +08:00