wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,231 Commits 1 Branch 0 Tags 4.3 MiB
68d0641f2e
Commit Graph

622 Commits

Author SHA1 Message Date
lilong
d1f63a5aeb feat:(REQ-2227) 调整删除角色的接口 2024-04-12 17:00:00 +08:00
lilong
7ded370e51 feat:(REQ-2227) 角色tree接口增加workspaceType 2024-04-12 14:14:34 +08:00
lilong
6b47280781 feat:(REQ-2227) 角色tree接口查询增加查询条件 2024-04-12 11:47:19 +08:00
zhansihu
5109552188 fix(2227-syncResource): http method调整 2024-04-12 10:51:01 +08:00
zhansihu
91368d1ffe Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-12 10:46:07 +08:00
zhansihu
6d1e238712 fix(2227-baseTree): 接口定义调整 2024-04-12 10:45:59 +08:00
lilong
65facb5106 feat:(REQ-2227) 增加角色的page接口，调整角色的tree接口 2024-04-11 19:08:15 +08:00
zhansihu
dc235edbff fix(2227-baseTree): 增加基准路由查询接口 2024-04-11 17:18:44 +08:00
lilong
44d1c21e47 feat:(REQ-2227) 修改角色offset修改url 2024-04-11 16:36:07 +08:00
lilong
91cf6fb11c feat:(REQ-2227) 角色树增加id，增加角色排序 2024-04-11 16:34:39 +08:00
lilong
fe0b171f07 feat:(REQ-2227) 角色增加是否显示、是否隐藏、角色编码字段 2024-04-11 11:01:32 +08:00
lilong
f11eca13bc feat:(REQ-2227) 修改新增角色的逻辑 2024-04-11 09:47:38 +08:00
lvshaohua
1689297635 api接口 2024-04-10 17:50:31 +08:00
lvshaohua
0f54c9399b 菜单角色关联关系 2024-04-10 17:46:50 +08:00
lvshaohua
44a328edce 获取详情树 2024-04-10 14:22:38 +08:00
zhansihu
9370ecf4cc fix(2227-permissionQuery): 增加返回页面路由 2024-04-10 14:00:06 +08:00
lvshaohua
5d0ddf85d0 菜单保存接口 2024-04-10 11:20:09 +08:00
lvshaohua
560a2aab48 Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java
 2024-04-10 09:40:44 +08:00
lvshaohua
58b47612a4 详情接口 2024-04-10 09:39:13 +08:00
李昆鹏
c61a03ba2a feat(2227-featureResource): 新增功能资源树查询接口及实现 2024-04-10 09:10:05 +08:00
lilong
793f34c67b feat:(REQ-2227) 增加api前缀 2024-04-09 22:29:10 +08:00
lilong
152ebc182f feat:(REQ-2227) 提供角色分组相关接口 2024-04-09 21:13:37 +08:00
lvshaohua
5f884c4beb Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-09 17:10:23 +08:00
lvshaohua
d1cf9e161d 菜单的排序，删除等 2024-04-09 17:10:14 +08:00
zhansihu
ce93e4d1d8 fix(2227-permissionQuery): 增加页面权限查询 2024-04-09 16:57:48 +08:00
zhansihu
ebed487c99 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-09 15:28:50 +08:00
zhansihu
107b6f784b fix(2227-permissionQuery): 增加用户功能鉴权接口 2024-04-09 15:28:42 +08:00
lilong
672c7d96c7 feat:(REQ-2227) 提供角色tree接口 2024-04-09 14:07:15 +08:00
zhansihu
0aeae35a1a fix(2227-permissionQuery): 处理分支错误 2024-04-08 19:36:14 +08:00
zhansihu
57eccebad7 Merge branch 'feature/REQ-2227' of axzsource.com:universal/infrastructure/backend/tyr into feature/REQ-2227 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureResourceService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
 2024-04-08 15:24:17 +08:00
lvshaohua
e25a6b9095 菜单组件的保存 2024-04-08 15:20:56 +08:00
zhansihu
695d48560e feat(2227-permissionQuery): 查询用户角色和权限 2024-04-08 15:20:54 +08:00
lilong
6fc00f0b1d feat:(REQ-2227) 增加注解，否则copy失败 2024-04-07 18:45:39 +08:00
zhansihu
599fd9ddaf feat(2227-permissionQuery): 接口定义调整 2024-04-07 17:58:38 +08:00
zhansihu
4e784d2fad Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-07 17:55:53 +08:00
zhansihu
7dcdd143d5 feat(2227-permissionQuery): 导航菜单查询接口定义 2024-04-07 17:55:47 +08:00
lvshaohua
c81eb30ded 保存组件 2024-04-07 14:49:44 +08:00
zhansihu
665f312ec1 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java
 2024-04-07 14:41:10 +08:00
zhansihu
bffda7fbc0 feat(2227-syncFeature): feature同步实现 2024-04-07 14:40:23 +08:00
李昆鹏
f7d67dce23 feat(2227-通讯录): 新增自定义权限查询，保存或更新自定义权限接口，修改更新用户角色接口 2024-04-07 14:36:42 +08:00
lvshaohua
51fdd3a0b1 编译问题 2024-04-07 14:22:20 +08:00
lvshaohua
25a7888078 保存菜单接口 2024-04-07 14:09:29 +08:00
zhansihu
6cf46dba73 feat(2227-syncFeature): feature同步 2024-04-07 09:38:37 +08:00
zhansihu
b8aecba0d6 feat(2227-commonDict): 调整接口实现 2024-03-28 09:39:37 +08:00
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
金海洋
374dd3c534 增加userScope 2024-01-22 13:24:36 +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
金海洋
45392def4b 增加描述 2024-01-16 16:05:35 +08:00
金海洋
086dcf42c6 修改备注 2024-01-16 15:32:11 +08:00
金海洋
712f53527e feat(server): rEQ-1902 增加数据权限 
https://jira.axzo.cn/browse/REQ-1902?goToView=1

modify:
1. 创建数据资源规则            /api/data-resource/create
2. 更新数据资源规则            /api/data-resource/update
3. 删除数据资源               /api/data-resource/delete
4. 数据资源分页               /api/data-resource/page
5. 数据资源列表               /api/data-resource/list
6. 创建功能点和数据资源的关联   /api/data-resource/saas-feature
7. 删除功能点和数据资源的关联   /api/data-resource/saas-feature/delete
8. 获取某个功能点的数据资源信息 /api/data-resource/saas-feature/detail
 2024-01-16 15:28:02 +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
wangli
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
zhansihu
3872f8cd00 refactor(permission-check): 优化日志+1 2023-11-03 10:09:30 +08:00
zhansihu
96d616afd0 refactor(permission-check): 优化日志；产品权限过滤 2023-11-03 09:38:34 +08:00
金海洋
010d16c495 listByRoleIds 增加workspace id 2023-10-26 18:06:32 +08:00
zhansihu
761ae92ca3 refactor(permission2identity): 增加返回personalId 2023-10-25 11:00:49 +08:00
zhansihu
9782249c3e Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-24 10:48:45 +08:00
zhansihu
46e34e0876 feature(permission-query): 修复请求转换 2023-10-24 10:48:39 +08:00
陈维伟
9c0bb80894 根据身份查询角色信息补充字段:是否包含权限集权限点信息,解决OMS、CMS逻辑矛盾问题 2023-10-23 19:12:38 +08:00
wangjibo
2006cd3b18 添加批量接口 2023-10-21 15:57:58 +08:00
wangjibo
ab93553a30 删除单位参与的工作台的所有的人员与角色。 目前主要是用于移除参与单位的地方 2023-10-21 15:54:12 +08:00
wangjibo
e2f692f830 删除超管角色 2023-10-21 15:35:08 +08:00
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
wangli
a00c9ff26d add - 新增通过工作台 id 查询权限点 2023-10-19 11:40:59 +08:00
wangli
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
wangli
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
TanJ
036809191c feat: WorkspaceJoinType 
使用int入参
 2023-10-17 14:32:37 +08:00
金海洋
25d6fb13a9 feat(server): 增加移除某个人在某个工作台的所有角色(除超管) 
https://jira.axzo.cn/browse/REQ-1502?goToView=1

modify:1. 增加 /api/saas-role-user/delete-user-role 接口
 2023-10-17 13:39:17 +08:00
TanJ
f27039610d feat: WorkspaceJoinType add match value 2023-10-17 11:10:13 +08:00
TanJ
aae3396474 feat: 优化 2023-10-16 21:04:07 +08:00
yangsong
4928a158df bugfix，通过roleid过滤 2023-10-16 18:51:12 +08:00
TanJ
d9b5412e5d feat: 权限返回参数精简 2023-10-16 18:09:58 +08:00
TanJ
ef33e01d85 Merge branch 'master' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeQueryReq.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
 2023-10-16 16:28:05 +08:00
陈维伟
75b01ce7db Merge branch 'master' into feature/REQ-1309 2023-10-16 16:02:44 +08:00
TanJ
b239181f77 feat: add log 2023-10-16 15:05:34 +08:00
TanJ
cd70e660a8 feat(通用接口): 添加权限通用接口 
通过人查权限
 2023-10-14 18:50:32 +08:00
TanJ
36c49119d6 feat(通用接口): 添加通过人查询权限的数据定义 2023-10-13 15:35:44 +08:00
zhansihu
a68b25aeb7 fix(saas-auth): 调整api path 2023-10-11 15:56:43 +08:00
yangsong
ed08224324 dataType添加枚举常量 2023-10-11 10:13:30 +08:00
yangsong
353dd2fd1b 添加字段非空验证 2023-10-10 09:36:51 +08:00
yangsong
47f2e531d5 添加字段非空验证 2023-10-10 09:36:15 +08:00
yangsong
856be1f093 bugfix 2023-10-09 20:21:49 +08:00
zhansihu
fad9ad47db fix(permissionPoint): 使用单位类型扩展支持 2023-10-09 18:17:48 +08:00
yangsong
3427838bb6 对象映射错误 2023-10-09 15:12:42 +08:00
zhansihu
c41f77678f refactor(细节调整；查询逻辑实现): 2023-10-09 15:07:53 +08:00
yangsong
8eb3168177 过滤无效节点 2023-10-09 11:52:17 +08:00
yangsong
a85bddc1de 直接添加端下一级菜单bugfix 2023-10-09 11:35:22 +08:00
yangsong
5d2ff1ad57 直接添加端下一级菜单bugfix 2023-10-09 09:45:42 +08:00
zhansihu
89382818ea feat(auth): 实现根据codes查询有权限用户 2023-10-08 18:05:38 +08:00
yangsong
e2a100fdd9 生成businessCode代码bug 2023-10-08 15:37:35 +08:00
zhansihu
4486aa8b12 feat(auth): 根据身份查询权限点实现 2023-10-08 11:04:19 +08:00
TanJ
611acadbf9 feat: 指量查询权限接口 2023-10-07 15:27:25 +08:00
chenwenjian
e015b16862 feat: 还原PermissionPointApplyDetailUpdateReq的id类型为Long 2023-10-07 15:20:52 +08:00
chenwenjian
4ad628bc0d Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 2023-10-07 15:00:52 +08:00
chenwenjian
708e8bebdf feat: 调整PermissionPointApplyDetailUpdateReq的id类型为String 2023-10-07 15:00:38 +08:00
yangsong
c6bc1dcfc2 获取节点树调整 2023-10-07 14:39:32 +08:00
yangsong
becda42c9e 修改节点类型判断 2023-10-07 10:37:42 +08:00
yangsong
42551bbf38 删除权限点接口 2023-10-07 10:27:31 +08:00
chenwenjian
0b400fcebc Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 2023-10-07 10:05:01 +08:00
chenwenjian
f250d44d2f feat: 调整updateApplyDetail入参delegatedType允许为空 2023-10-07 10:04:35 +08:00
yangsong
659043a546 添加页面控制字段 2023-10-06 16:58:10 +08:00
yangsong
a051b8f1b3 提交申请 2023-10-06 15:45:38 +08:00
yangsong
3511730aaa Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 2023-10-06 14:42:13 +08:00
yangsong
2efd83ee25 添加字典id 2023-10-06 14:42:07 +08:00
陈维伟
1f2e8b8928 添加参数:查询审批流表单查看/编辑权限 2023-10-06 11:44:14 +08:00
yangsong
961cc2307b 明细添加字段 2023-10-06 10:24:05 +08:00
yangsong
500716e9ec 解决冲突 2023-09-28 18:30:43 +08:00
yangsong
f6aee5bc16 Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApplyApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointApplyController.java
 2023-09-28 18:28:07 +08:00