Commit Graph

264 Commits

Author SHA1 Message Date
wangjibo
bea6d121e1 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-21 15:02:42 +08:00
wangjibo
63ec1595f3 用户角色接口调整 2023-10-21 15:02:37 +08:00
金海洋
2eb5b95c30 修改 SuperAminInfoResp 2023-10-21 14:59:28 +08:00
金海洋
5080d67322 增加 batchSuperAdminList api 2023-10-21 14:27:40 +08:00
wangjibo
f26036f652 角色接口调整,删除重复api接口 2023-10-21 14:23:53 +08:00
zhansihu
2a3132b665 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-21 14:10:11 +08:00
zhansihu
7bee500ca2 feat(code2identity): 实现权限查人接口 2023-10-21 14:09:57 +08:00
金海洋
c0165d17a2 增加 batchSuperAdminList api 2023-10-21 12:54:03 +08:00
金海洋
4543eec11e 修改BaseWorkspaceAndOuModel 2023-10-21 10:55:34 +08:00
金海洋
0f1a9c98f6 修改BaseWorkspaceAndOuModel 2023-10-21 10:54:56 +08:00
金海洋
d2f2d46f4b 修改BaseWorkspaceAndOuModel 2023-10-21 10:48:36 +08:00
张弘昊
f7380df0ec 请求参数加上builder 2023-10-20 17:54:20 +08:00
金海洋
34481efaa5 feat(server): 修改查询企业工作台超级管理员 2023-10-20 15:41:57 +08:00
陈维伟
7d0e7d68fd 查询角色信息通用接口默认不返回角色下的权限集信息,提高接口处理速度 2023-10-20 14:08:17 +08:00
zhansihu
1e03e4c0df refactor(role-query): 用户增加返回ouid 2023-10-20 10:50:01 +08:00
yangsong
c437ace6d7 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
2023-10-20 09:50:05 +08:00
yangsong
7b0be4dfd2 创建机构管理员账户角色 2023-10-20 09:48:33 +08:00
金海洋
542443fd25 feat(server): 修改用户角色列表接口 2023-10-19 18:02:40 +08:00
张弘昊
2defb39906 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 17:25:18 +08:00
张弘昊
a009656d5f 通过名称获取角色 2023-10-19 17:25:12 +08:00
zhansihu
707e748a64 refactor(role-query): 改变角色查询逻辑 2023-10-19 16:26:39 +08:00
zhansihu
24f30d7fd2 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 15:38:20 +08:00
zhansihu
70044ff732 refactor(role-query): 增加参建单位资质条件 2023-10-19 15:38:09 +08:00
yangsong
b24927820a 创建机构用户权限 2023-10-19 13:54:38 +08:00
a00c9ff26d add - 新增通过工作台 id 查询权限点 2023-10-19 11:40:59 +08:00
80591cd3ee add - 新增通过工作台 id 查询权限点 2023-10-19 11:29:22 +08:00
zhansihu
8cff1d1338 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 10:16:12 +08:00
zhansihu
7009b40444 feature(permission-query): 权限检查接口 2023-10-19 10:16:06 +08:00
张弘昊
f8bc855e50 Merge remote-tracking branch 'origin/feature/REQ-1502-zhh' into feature/REQ-1502 2023-10-19 10:01:13 +08:00
张弘昊
33d1b8fddd 获取权限码 2023-10-19 09:51:10 +08:00
yangsong
df12ccdd8e Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
2023-10-18 17:02:57 +08:00
yangsong
adbdf51b80 删除用户角色 2023-10-18 17:01:21 +08:00
zhansihu
eb7d2e3005 refactor(role-query): test调整 2023-10-18 16:38:29 +08:00
zhansihu
a05bd02bf3 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
2023-10-18 16:27:18 +08:00
zhansihu
ea4883c6b5 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
2023-10-18 16:24:56 +08:00
张弘昊
f757421375 通过名字获取角色信息 2023-10-18 16:24:56 +08:00
zhansihu
d14cb28066 feature(role-query): 角色分页查询接口 2023-10-18 16:22:53 +08:00
10cdd20b93 add - 新增通过工作台 id 查询权限点 2023-10-18 16:20:04 +08:00
张弘昊
2d366e4500 创建超级管理员角色 2023-10-18 15:45:36 +08:00
张弘昊
a05b3b57a5 创建超级管理员角色 2023-10-18 14:49:41 +08:00
张弘昊
0d5453efdf Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
2023-10-18 14:47:56 +08:00
张弘昊
692a0a0e66 创建超级管理员角色 2023-10-18 14:47:00 +08:00
TanJ
cd4751ebce feat: terminal
terminal查询逻辑调整
2023-10-18 10:56:58 +08:00
金海洋
0161d655c0 feat(server): 删除 deleteUserRolesOfWorkspace 接口 2023-10-18 09:46:47 +08:00
yangsong
a1b584c1ef url添加前缀 2023-10-17 19:23:18 +08:00
yangsong
6999302f6f Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
2023-10-17 19:20:59 +08:00
yangsong
38b200e600 接口迁移,删除管理员角色参数调整 2023-10-17 19:17:18 +08:00
金海洋
cb6aa953e1 feat(server): 增加删除工作台下的所有人员与平台角色接口
https://jira.axzo.cn/browse/REQ-1502?goToView=1

modify:
1. 增加删除工作台下的所有人员与平台角色接口
2023-10-17 18:55:27 +08:00
yangsong
31958870c9 接口迁移,接口定义 2023-10-17 16:59:20 +08:00
zhansihu
1569262201 feature(saas-auth): 定义新的权限查人接口 2023-10-17 16:48:23 +08:00