Commit Graph

424 Commits

Author SHA1 Message Date
zhansihu
9bba45c4ed feat(2227-commonDict): 接口调整 2024-03-26 17:54:44 +08:00
zhansihu
f09a13e316 feat(2227-commonDict): 通用字典查询 2024-03-26 17:53:29 +08:00
zhansihu
ee71876cff fix:(2046-permission): 修改类型 2024-02-26 23:31:47 +08:00
zhansihu
ec230f813e fix:(2046-permission): 增加注解 2024-02-26 22:46:49 +08:00
zhansihu
963c99ca4e Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046 2024-02-26 21:44:32 +08:00
zhansihu
679242517a fix:(2046-permission): 暴露接口 2024-02-26 21:44:26 +08:00
TanJ
b507348d93 获取资源权限添加resourceId与resourceType字段 2024-02-22 11:42:47 +08:00
henry
13c7b79591 REQ-2046 小组长权限 2024-02-06 17:15:54 +08:00
TanJ
49fa464f52 设置代班长接口添加roleId 2024-02-06 14:36:57 +08:00
zhansihu
b5a99ddf33 fix:(2046-permission): 修复参数问题;更新权限检查接口 2024-02-02 11:13:25 +08:00
zhansihu
7a5ec1bfb8 feat(2046-permission): 修复角色查询 2024-02-01 15:58:21 +08:00
zhansihu
2e1e09760b feat(2046-permission): 重构权限查人逻辑 2024-02-01 14:47:57 +08:00
zhansihu
86dcb10442 Merge remote-tracking branch 'origin/master' into feature/REQ-2046
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasAuthApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/auth/TyrSaasAuthController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/TyrSaasAuthService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
2024-02-01 10:05:42 +08:00
金海洋
566e768a30 /api/saas-role-user/list 增加personId的参数 2024-01-31 19:22:26 +08:00
luofu
3dbfb14078 feat(REQ-2046): 新增通过appItemId查询featureId的接口 2024-01-31 16:14:48 +08:00
TanJ
018e79b65c feat(2046) 创建超管设置product type 2024-01-27 15:54:36 +08:00
zhansihu
120d9e0952 feat(2046-permission): 去重ou workspace对 2024-01-27 11:05:43 +08:00
zhansihu
38ca0a3d3a refactor(2046-permission): 取消参数必传 2024-01-25 10:17:59 +08:00
chenwenjian
4e80d5c4c6 feat(REQ-2046): 添加Getter方法
接口:cn.axzo.tyr.client.common.enums.SaasPositionEnum
2024-01-24 14:46:22 +08:00
chenwenjian
1a7962b705 feat(REQ-2046): 调整SaasRoleCategoryVO结构 2024-01-23 18:40:49 +08:00
zhansihu
f864fbe6e9 feat(2046-permission): 小组类型按班组类型处理 2024-01-23 12:01:00 +08:00
zhansihu
1782683093 fix(2046-merge): 处理合并冲突 2024-01-22 13:50:18 +08:00
zhansihu
9ab6d8b063 Merge branch 'feature/REQ-2046-zhan' into feature/REQ-2046
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
2024-01-22 10:08:19 +08:00
chenwenjian
2ad0607fd7 feat(REQ-2046): 兼容getById 2024-01-20 20:03:37 +08:00
TanJ
48843d28ec feat(2046) fix join type 2024-01-20 10:55:25 +08:00
zuoqinbo
6b6125f245 feat:REQ-2046 personId查询角色信息 2024-01-20 10:31:57 +08:00
zhansihu
972463c3b6 feat(2046-authPermission): 权限检查支持person id 2024-01-19 18:28:03 +08:00
zhansihu
e5e0c2463b fix(auth): 调整接口定义 2024-01-17 14:36:01 +08:00
zhansihu
308c3f5f3d fix(auth): 增加mapping 2024-01-17 14:21:05 +08:00
zhansihu
e0027297c7 fix(auth): 增加接口在项目部下权限查人 2024-01-17 13:40:57 +08:00
yangheng
4b64fa9d3f Merge branch 'feature/REQ-2046-yh' into 'feature/REQ-2046'
REQ-2039 url fix

See merge request universal/infrastructure/backend/tyr!21
2024-01-16 09:36:55 +00:00
henry
6c503d8683 REQ-2039 url fix 2024-01-16 17:36:12 +08:00
yangheng
9434a08596 Merge branch 'feature/REQ-2046-yh' into 'feature/REQ-2046'
REQ-2039 enum fix

See merge request universal/infrastructure/backend/tyr!19
2024-01-16 09:27:15 +00:00
henry
842cb87fa5 REQ-2039 enum fix 2024-01-16 17:25:11 +08:00
吕绍华
622bd71c79 Merge branch 'feature/REQ-2046-yh' into 'feature/REQ-2046'
REQ-2039 RPC 小组长

See merge request universal/infrastructure/backend/tyr!18
2024-01-16 08:50:40 +00:00
henry
633e150b8c REQ-2039 RPC 小组长 2024-01-16 16:41:16 +08:00
TanJ
d617917e45 feat(2046) fix 设置角色时,使用group id查询 2024-01-16 11:44:19 +08:00
TanJ
a897771bf3 feat(2046) 添加通过角色分组Code查询标准角色接口 2024-01-13 18:39:09 +08:00
TanJ
aef8a7778e feat(2046) 修改批量获取权限分组接口 2024-01-13 17:41:48 +08:00
TanJ
fb29af7950 feat(2046) 班组管理员、代班长设置权限接口调整 2024-01-13 11:47:48 +08:00
wangjibo
e4c45c6bd7 Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046 2024-01-10 20:55:03 +08:00
wangjibo
986407d5db teamOuId 平台班组id 2024-01-10 20:54:55 +08:00
TanJ
e76ded018d feat(2046) 班组管理员添加支持批量设置与清除 2024-01-10 10:49:52 +08:00
TanJ
e432ed7260 feat(2046) 班组管理员相关权限添加批量取消授权功能 2024-01-09 18:51:41 +08:00
TanJ
a93d71e11a feat(2046) ListPermissionFromRoleGroupReq add constructor 2024-01-09 17:57:27 +08:00
TanJ
673f7a7397 feat(2046) 添加班组管理员、代班长、查询 权限信息 2024-01-09 17:28:32 +08:00
zhansihu
6ea662e253 refactor(permission): 重构人员权限查询 2024-01-09 16:03:35 +08:00
TanJ
abe02d21b8 feat(2046) 添加班组管理员、代班长、查询 权限信息 2024-01-08 14:55:45 +08:00
TanJ
4b1d49f1a9 Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046 2024-01-05 16:17:08 +08:00
TanJ
48837ebf65 feat(2046) 添加班组管理员、代班长、基于权限分类和资源ID查询逻辑 2024-01-05 16:16:48 +08:00
zhansihu
2dbe9590ed fix(permission): 权限请求默认使用缓存 2024-01-05 14:50:25 +08:00
wangjibo
a6d7dfd76e Merge branch 'feature/REQ-2046-wangjibo' into feature/REQ-2046 2024-01-04 16:28:18 +08:00
wangjibo
81c09770d3 1.授权或者取消授权平台班组长和项目内班组长角色
2.oms 预设角色管理 添加 productRoleType 字段
2024-01-04 16:22:54 +08:00
zhansihu
fc1f1d082b fix(permission): 权限缓存测试修复 2024-01-04 15:00:38 +08:00
zhansihu
26cee3d6b5 refactor(permission): 权限缓存统一处理;增加暂时禁用处理逻辑和接口 2024-01-04 11:45:36 +08:00
zhansihu
5884bd1edc feat(permission): 增加person查询权限;重构权限点查询 2024-01-03 15:43:50 +08:00
zhansihu
5f9bf8f710 refactor(permission): 增加权限缓存开关,调整默认值 2024-01-02 17:47:54 +08:00
zhansihu
d061dbad4d refactor(permission): 授权查询缓存 2023-12-26 17:10:12 +08:00
谭杰
0ac6eecde7 Merge branch 'feature/TJ_permission_menu' into 'master'
Feature/tj permission menu

See merge request universal/infrastructure/backend/tyr!16
2023-12-20 09:18:41 +00:00
陈维伟
4fd8f32f59 Merge remote-tracking branch 'origin/master' into feature/REQ-1696
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
2023-12-18 20:40:15 +08:00
陈维伟
14194fe6a4 实现逻辑:
获取分包负责人等特殊角色
2023-12-18 18:48:07 +08:00
陈维伟
565ea4d70b 实现逻辑:
查询角色通用接口添加查询逻辑是否包含分包负责人等特殊角色
2023-12-18 14:16:28 +08:00
陈维伟
75d8f959ad add comment 2023-12-13 16:31:32 +08:00
ebbbd675f5 Merge remote-tracking branch 'origin/master' into feature/REQ-1650 2023-12-13 13:51:53 +08:00
陈维伟
79013cb2c1 add comment 2023-12-09 17:23:00 +08:00
zuoqinbo
be5f10e1e8 bugfix: 修复无法正确删除角色问题 2023-12-07 15:29:48 +08:00
zuoqinbo
e15bad7def bugfix: 修复无法正确删除角色问题 2023-12-07 15:18:58 +08:00
陈维伟
5c3c3e19b5 add comment 2023-12-07 14:02:28 +08:00
陈维伟
70b86b8f4e add comment 2023-12-07 13:57:05 +08:00
陈维伟
526564e253 实现接口:
删除用户角色关联关系接口
2023-12-06 16:20:33 +08:00
zuoqinbo
5d8db627d0 feat: REQ-1650 账户异动参数 2023-12-05 12:05:03 +08:00
陈维伟
08619a8f5e 实现逻辑:
查询产品列表
新增产品
更新产品
2023-12-05 11:34:16 +08:00
zuoqinbo
02537e43d4 feat: REQ-1650 2023-12-05 10:24:32 +08:00
zuoqinbo
1a8cdc41ee Merge remote-tracking branch 'origin/feature/REQ-1650' into feature/REQ-1650 2023-12-01 15:40:35 +08:00
zuoqinbo
b6f800691f feat: REQ-1650 2023-12-01 15:40:12 +08:00
TanJ
b50725a9c1 fix : 角色查询bug 2023-12-01 15:30:28 +08:00
zuoqinbo
495e026157 feat: REQ-1650 2023-12-01 11:23:55 +08:00
TanJ
0d0a8810c0 fix(1882): 名称修改 2023-12-01 10:54:24 +08:00
陈维伟
296959f0c4 解决反序列化错误问题
ListIdentityFromPermissionResp
2023-11-30 20:19:55 +08:00
TanJ
b0048071e7 fix(1882): 添加权限点相关接口 2023-11-30 18:25:15 +08:00
zuoqinbo
96ff41ef79 feat: REQ-1650 2023-11-30 18:19:49 +08:00
zuoqinbo
9e56ef41d6 feat: REQ-1650 2023-11-30 18:00:31 +08:00
zuoqinbo
d252f9f230 feat: REQ-1650 2023-11-30 11:45:21 +08:00
zuoqinbo
29c75710ca feat: REQ-1650 2023-11-29 16:46:28 +08:00
zhansihu
0232279c83 feat(permission): 权限查询支持指定角色 2023-11-27 18:10:49 +08:00
zuoqinbo
9aeb17c480 feat: REQ-1650 角色ID查询人员列表 2023-11-25 15:21:43 +08:00
zuoqinbo
d9d582b117 feat:账户变更记录 2023-11-24 09:50:29 +08:00
zuoqinbo
04c50e6fbd Merge remote-tracking branch 'origin/dev' into dev 2023-11-23 19:00:10 +08:00
zuoqinbo
f04357f279 feat:账户变更记录 2023-11-23 18:59:49 +08:00
TanJ
3fb08ce52f Merge remote-tracking branch 'origin/feature/REQ-1609' into dev 2023-11-23 16:54:22 +08:00
TanJ
7f5bc29ce1 fix(1609): 接口命名BUG 2023-11-23 16:53:00 +08:00
zhansihu
1cdbf9acaf Merge remote-tracking branch 'origin/feature/REQ-1609' into dev
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
2023-11-21 17:13:06 +08:00
zhansihu
e1177f20e8 feat(flow): 增加支持多ou和workspace 2023-11-21 17:11:02 +08:00
TanJ
5e02894336 Merge branch 'feature/REQ-1609' into dev 2023-11-16 17:09:34 +08:00
TanJ
0c69e67c09 feat(1609): 工作台查询角色 2023-11-16 17:09:04 +08:00
zhansihu
ebd693a781 feat(base-dict): 字典参数描述 2023-11-15 17:22:05 +08:00
zhansihu
775f19b682 Merge remote-tracking branch 'origin/feature/REQ-1609' into dev 2023-11-15 14:02:46 +08:00
zhansihu
eb0fa082eb feat(base-dict): 增加字典类型 2023-11-15 14:01:23 +08:00
zhansihu
4dfb9efbf8 feat(role-user): 增加角色用户分页接口 2023-11-14 17:06:59 +08:00
zhansihu
1227e0a94f refactor(permission-tree): 增加支持是否过滤子节点 2023-11-03 11:52:43 +08:00