Commit Graph

1181 Commits

Author SHA1 Message Date
陈维伟
9907742993 fix bug 2023-09-16 18:23:45 +08:00
陈维伟
0b44d32c26 add implements 2023-09-16 18:19:59 +08:00
yangsong
3593a17951 异常处理优化 2023-09-16 18:17:12 +08:00
yangsong
8087854336 异常处理 2023-09-16 17:49:54 +08:00
陈维伟
712cfa0b86 fix bug:npe 2023-09-16 16:13:38 +08:00
yangsong
189e1ffa98 修改异常类型,合并list和page方法 2023-09-16 14:56:20 +08:00
陈维伟
5348476aa7 权限组返回结果添加创建时间和更新时间 2023-09-16 11:01:58 +08:00
yangsong
7a80452c82 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 18:11:17 +08:00
yangsong
8ed88b9813 角色,分组,权限集 名称不能重复验证 2023-09-15 18:11:07 +08:00
陈维伟
08c0d58345 fix bug:删除角色分组 2023-09-15 17:55:38 +08:00
陈维伟
f699a6049f fix bug:selectedOu.size 2023-09-15 17:28:23 +08:00
金海洋
1b72a1c10c feat(server): add /api/saas-role-user/delete api 2023-09-15 16:13:10 +08:00
zhansihu
1644217e75 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 15:08:51 +08:00
zhansihu
0aee92334e fix(权限点): 修正树形顶级展示逻辑 2023-09-15 15:08:45 +08:00
TanJ
17c741869a fix: 添加自然人ID 2023-09-15 14:56:37 +08:00
zhansihu
f3e1ac397e Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 14:23:52 +08:00
zhansihu
42ae74b0e2 refactor(权限点): 列表查询增加IDS条件;
fix(权限点): 修正排序bug
2023-09-15 14:23:46 +08:00
yangsong
5b0eeb584b codereview bugfix 2023-09-15 14:02:24 +08:00
陈维伟
d7eafc1697 角色数据清洗 saasRoleGroup.sort=1 2023-09-15 10:14:12 +08:00
陈维伟
4eedc3ca04 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 10:10:04 +08:00
陈维伟
036960475a 角色数据清洗 saasRoleGroup.workspaceType=6 2023-09-15 10:09:59 +08:00
yangsong
7aa37d7d07 bugfix 2023-09-14 20:49:28 +08:00
陈维伟
599ced9fd2 code review add comment refect 2023-09-14 18:21:16 +08:00
陈维伟
c0334565aa code review add comment refect 2023-09-14 18:13:45 +08:00
陈维伟
e0501daf68 code review add comment refect 2023-09-14 17:57:44 +08:00
金海洋
b219f788aa modify OrganizationalJobConfig update api 2023-09-14 16:52:36 +08:00
金海洋
e6ceb71324 feat(server): add /api/saas-role-user/list api 2023-09-14 16:48:19 +08:00
陈维伟
675e1bd065 code review add comment 2023-09-14 16:19:53 +08:00
zhansihu
9af061131f fix(权限点): 兼容空sort 2023-09-14 16:04:42 +08:00
zhansihu
4710057f44 fix(权限点): 过滤修复 2023-09-14 14:34:30 +08:00
zhansihu
8adbb01be0 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-14 14:26:41 +08:00
zhansihu
017588b230 refactor(权限点): 代码优化 2023-09-14 14:26:35 +08:00
yangsong
3210aa2d6d package rename 2023-09-14 13:42:33 +08:00
zhansihu
0fc1694edf Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-14 11:36:59 +08:00
zhansihu
f7ae347b08 refactor(权限点): 排序实现重构;支持新增时重新排序 2023-09-14 11:36:53 +08:00
yangsong
fbd3ac440a 查询角色分组树 bugfix 2023-09-14 11:02:33 +08:00
陈维伟
5aa7d1845d Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-14 10:58:24 +08:00
陈维伟
627a5852c1 查询角色分组接口补充查询参数 2023-09-14 10:58:19 +08:00
TanJ
bd27016a3d feat: roleType移至common供yoke消费 2023-09-14 10:52:57 +08:00
yangsong
80140309ad 删除角色分组 2023-09-14 09:41:31 +08:00
zhansihu
3677cad80e Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 21:06:42 +08:00
zhansihu
37d6de4412 fix(权限点): 修复delegatedType赋值 2023-09-13 21:06:37 +08:00
yangsong
22d6900246 删除例外权限集 2023-09-13 21:04:01 +08:00
yangsong
609aaddc28 例外新增保存 2023-09-13 20:24:24 +08:00
zhansihu
f7fdf994a7 Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1102 2023-09-13 19:50:24 +08:00
zhansihu
2919d720ac refactor(权限点): 兼容处理适用单位和节点 2023-09-13 19:49:45 +08:00
陈维伟
b42e6fb0ba 修复权限与权限集对应关系错误问题 2023-09-13 18:12:28 +08:00
TanJ
e756f65631 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 18:01:11 +08:00
TanJ
472f65adfc fix: 指删除role user 报错修复
同时添加了启动参数
2023-09-13 18:00:47 +08:00
陈维伟
87fb605eef 查询角色通用接口补充是否包含权限集的开关 2023-09-13 17:53:06 +08:00
yangsong
3c8c6179c7 通用权限点保存 2023-09-13 17:33:56 +08:00
zhansihu
5f2aeb12e2 Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1102 2023-09-13 17:06:06 +08:00
zhansihu
adc9e97a39 refactor(权限点): 参数处理调整 2023-09-13 17:05:32 +08:00
TanJ
3742128010 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 17:02:20 +08:00
TanJ
d3e69ba8ed feat: 添加非管理员角色进行角色变更的接口 2023-09-13 17:02:11 +08:00
yangsong
e666e5c2bc 角色新增或保存 2023-09-13 16:53:28 +08:00
陈维伟
5a49466f0d 补充权限集作用范围筛选逻辑 2023-09-13 16:45:28 +08:00
陈维伟
2ff21391e8 rename TyrSaasRoleApi 2023-09-13 15:37:13 +08:00
chenwenjian
c7e54252d1 获取workSpaceType 2023-09-13 14:53:43 +08:00
chenwenjian
750dc72a7c Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java
2023-09-13 14:51:40 +08:00
chenwenjian
2ac5dd5d77 字典更新修复 2023-09-13 14:49:14 +08:00
chenwenjian
4aa4b96914 字典更新修复 2023-09-13 14:01:31 +08:00
zhansihu
dfb5520408 fix(权限点): 兼容parent id数据 2023-09-13 13:53:24 +08:00
陈维伟
614b3289ea Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 11:43:21 +08:00
陈维伟
cc88853f9c 补充自定义角色查询条件 2023-09-13 11:43:17 +08:00
zhansihu
eca1a4e8d5 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 11:42:09 +08:00
zhansihu
1742289754 fix(权限点): 兼容直接查询workspacetype 2023-09-13 11:42:03 +08:00
陈维伟
4612287b38 补充自定义角色查询条件 2023-09-13 11:05:17 +08:00
zhansihu
af0ef14370 refactor(权限点): 列表查询增加参数;删除返回bizNo 2023-09-13 10:13:57 +08:00
chenwenjian
ab57db18a2 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 09:54:37 +08:00
zhansihu
fd1aeee956 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 09:54:13 +08:00
zhansihu
b100ec729b feature(权限点): 增加列表查询接口;增加位置移动接口 2023-09-13 09:54:06 +08:00
chenweiwei
538a17e807 查询角色权限集列表接口补充权限作用范围筛选逻辑 2023-09-12 23:14:58 +08:00
yangsong
4a24ab8126 项目部单位列表接口 2023-09-12 21:05:46 +08:00
yangsong
041145b8e5 创建人姓名和修改人姓名 2023-09-12 19:14:30 +08:00
chenwenjian
2f671973bb Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-12 18:59:53 +08:00
yangsong
d1c7059e6d 报错处理 2023-09-12 18:57:07 +08:00
chenwenjian
4c15287672 Merge branch 'feature/REQ-1212' into feature/REQ-1102
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
2023-09-12 18:52:57 +08:00
chenwenjian
d12de53f95 字典接口优化 2023-09-12 18:51:15 +08:00
045c1f8db6 add - 产品与权限点查询接口新增字典 code 的查询条件 2023-09-12 18:49:53 +08:00
0ad3ae6483 add - 产品与权限点查询接口新增字典 code 的查询条件 2023-09-12 18:23:41 +08:00
yangsong
38dd3d3f79 返回类型变更 2023-09-12 16:42:43 +08:00
陈维伟
57d5ab56a4 完善根据身份id和身份类型批量查询角色接口 2023-09-12 16:24:00 +08:00
陈维伟
812ff3fab4 实现删除角色分组部分代码 2023-09-12 16:14:49 +08:00
zhansihu
905e216bd1 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-12 14:43:11 +08:00
zhansihu
50a4d12540 refactor(权限点): 增加通过ID过滤树 2023-09-12 14:41:07 +08:00
yangsong
d9528f03fa 返回类型变更 2023-09-12 14:10:31 +08:00
zhansihu
26e1438414 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-12 13:44:24 +08:00
zhansihu
095c48fcb6 refactor(权限点): 增加终端类型定义 2023-09-12 13:44:13 +08:00
陈维伟
4aba28d271 角色存量数据清洗验证完毕 2023-09-12 10:59:39 +08:00
zhansihu
9063edc6ef Merge branch 'feature/REQ-1102' of axzsource.com:universal/infrastructure/backend/tyr into feature/REQ-1102 2023-09-12 10:41:05 +08:00
zhansihu
61d15ede26 refactor(权限点): 级联删除子节点,关联删除权限集 2023-09-12 10:40:39 +08:00
chenwenjian
0750502987 获取树形节点问题修复 2023-09-12 09:41:46 +08:00
chenwenjian
c861688d5d Merge branch 'feature/REQ-1212' into feature/REQ-1102 2023-09-12 09:37:01 +08:00
chenwenjian
800806f1ef 获取树形节点问题修复 2023-09-12 09:36:17 +08:00
陈维伟
da5a037f32 完善软删逻辑 2023-09-11 20:59:08 +08:00
陈维伟
de247b8b38 clean 2023-09-11 20:40:02 +08:00
陈维伟
908c1104bc Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 20:35:48 +08:00
陈维伟
aa7a9a1a9f 完善角色处理逻辑 2023-09-11 20:35:42 +08:00
958ea432c5 fix - 调整产品与权限点关联关系的存储实现 2023-09-11 19:51:08 +08:00
chenwenjian
957070b9fc Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 18:37:20 +08:00
陈维伟
5e3851dfac Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 18:36:37 +08:00
陈维伟
a0d55bd61a fix bug:角色查询逻辑拼接ouTypeCode查询逻辑问题 2023-09-11 18:36:32 +08:00
zhansihu
7c1a1f3959 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 18:28:24 +08:00
zhansihu
23c223dda9 fix(权限点): 忽略不需要的属性 2023-09-11 18:28:19 +08:00
chenwenjian
e739e0f151 Merge branch 'feature/REQ-1212' into feature/REQ-1102 2023-09-11 18:22:44 +08:00
chenwenjian
3569c1b9db 更改状态接口 2023-09-11 18:21:31 +08:00
yangsong
f4e4c0fdcf 获取角色详情,分组角色id过滤 2023-09-11 18:17:52 +08:00
陈维伟
d229937ac0 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 17:52:52 +08:00
陈维伟
25b309a1a6 验证角色数据清洗 2023-09-11 17:52:47 +08:00
zhansihu
d4099a66dd fix(权限点):数据过滤对象 2023-09-11 17:33:37 +08:00
zhansihu
930191d84a Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 17:26:41 +08:00
zhansihu
8faa8f2cb0 refactor(权限点):增加支持workspace查询;构建顶层 2023-09-11 17:26:35 +08:00
陈维伟
3766422f3b Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 16:36:17 +08:00
陈维伟
4633c44cc6 补充删除权限集逻辑 2023-09-11 16:36:10 +08:00
chenwenjian
9326537e4b Merge branch 'feature/REQ-1212' into feature/REQ-1102
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java
2023-09-11 16:27:56 +08:00
chenwenjian
742243b758 BasicDictQueryReq入参code变为codes 2023-09-11 16:23:01 +08:00
陈维伟
8409db6023 添加角色清洗逻辑 2023-09-11 16:12:37 +08:00
zhansihu
a2f2471193 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 15:24:32 +08:00
zhansihu
60b7f72655 refactor(权限点):保存接口增加返回当前信息 2023-09-11 15:24:26 +08:00
8bd09278bf update - 字典list 接口增加通过 ID 获取 2023-09-11 15:24:07 +08:00
aae9578fac update - 字典list 接口增加通过 ID 获取 2023-09-11 15:06:29 +08:00
e380d0c942 add - 新增批量获取字典接口 2023-09-11 15:03:16 +08:00
chenwenjian
b2252789ec Merge branch 'feature/REQ-1212' into feature/REQ-1102 2023-09-11 14:40:34 +08:00
chenwenjian
ab091ebb63 获取字典树 2023-09-11 14:38:27 +08:00
f2ebf603bc update - 调整产品删除实现逻辑 2023-09-11 14:06:14 +08:00
陈维伟
475ff9fda0 配置启动类 2023-09-11 13:46:23 +08:00
陈维伟
e25cc8f8a4 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
2023-09-11 11:33:43 +08:00
陈维伟
81ab60e44f 补充根据身份id类型批量查询接口 2023-09-11 11:31:22 +08:00
yangsong
a075351fa9 Merge branch 'feature/REQ-1102' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-1102 2023-09-11 11:10:20 +08:00
yangsong
77bf00fadb 角色分组spi service 2023-09-11 11:10:13 +08:00
775a68ee7d update - 调整产品删除实现逻辑 2023-09-11 11:00:03 +08:00
chenwenjian
15b43ee0a8 Merge branch 'feature/REQ-1212' into feature/REQ-1102
# Conflicts:
#	tyr-server/pom.xml
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
2023-09-11 10:52:55 +08:00
chenwenjian
1987468897 获取字典节点列表接口 2023-09-11 10:49:41 +08:00
陈维伟
a31d8218fe 根据身份查询角色接口补充workspaceId ouId 2023-09-11 10:29:32 +08:00
chenweiwei
a79b7419d3 clear log 2023-09-10 15:27:29 +08:00
chenweiwei
3054198020 调整api list返回结构 2023-09-10 15:23:47 +08:00
chenweiwei
b2a18a7776 实现接口:角色通用查询接口 2023-09-10 15:06:22 +08:00
chenweiwei
c670da3c8a 补充权限点字段 2023-09-10 12:21:13 +08:00
chenweiwei
a25a245b9b 实现接口:根据身份id和身份类型查询角色、权限集、权限 2023-09-09 23:02:46 +08:00
chenwenjian
985c4e4d66 获取字典节点接口 2023-09-08 19:10:59 +08:00
陈维伟
52f71613d3 add comment 2023-09-08 19:03:10 +08:00
2eb2573fa4 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java
2023-09-08 18:44:55 +08:00
c200db3c4b update - 调整工程引入的 jar, 同时修改 bootstrap.yml 默认内容, 完成相关功能开发 2023-09-08 18:44:20 +08:00
chenwenjian
6b86f3afff Merge branch 'feature/REQ-1212' into feature/REQ-1102 2023-09-08 18:42:14 +08:00
chenwenjian
ea29183145 接口调整 2023-09-08 18:39:51 +08:00
chenwenjian
47e887c392 接口调整 2023-09-08 18:35:54 +08:00
chenwenjian
ca3ff9212d Merge branch 'feature/REQ-1212' into feature/REQ-1102 2023-09-08 18:25:56 +08:00
chenwenjian
169662e0b0 结构调整 2023-09-08 18:24:50 +08:00
陈维伟
5284c72ab1 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-08 18:23:16 +08:00
陈维伟
46282ebbe9 实现RoleApi 2023-09-08 18:23:10 +08:00
chenwenjian
e09c9045eb 字典接口调整 2023-09-08 18:21:01 +08:00
zhansihu
33674308d9 Merge branch 'feature/REQ-1204' into feature/REQ-1102 2023-09-08 16:29:38 +08:00
zhansihu
750bbce2be refactor(权限点):详情返回对象变更;追加信息 2023-09-08 16:29:13 +08:00
陈维伟
2281bc3552 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-08 16:06:15 +08:00
陈维伟
35683b2f99 ouTypeId -> ouTypeCode
workspaceTypeId -> workspaceTypeCode
2023-09-08 16:06:10 +08:00
chenwenjian
6a6416d073 Merge branch 'feature/REQ-1212' into feature/REQ-1102
# Conflicts:
#	tyr-server/pom.xml
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/app/package-info.java
2023-09-08 16:05:38 +08:00
chenwenjian
8f80147d18 字典接口定义 2023-09-08 16:02:30 +08:00
chenwenjian
5194d7fbbf 字典接口定义 2023-09-08 16:01:36 +08:00
zhansihu
ad02d292c2 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1204 2023-09-08 13:50:24 +08:00
zhansihu
d981789b3d refactor(权限点):实现保存 删除 变更接口 2023-09-08 13:48:09 +08:00
chenwenjian
2df098dd53 删除无用包 2023-09-08 11:49:23 +08:00
陈维伟
67932a1a05 添加枚举和人员角色关联实体 2023-09-08 11:46:51 +08:00
zhansihu
ac0f6f116e Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1204 2023-09-08 10:02:20 +08:00
zhansihu
794e0dc515 feature(权限点):增加保存 删除 变更接口 2023-09-08 10:02:01 +08:00
e099e97f3f add - 添加产品相关接口的实现 2023-09-07 19:07:20 +08:00
5473f434d6 add - 添加产品相关接口的实现 2023-09-07 18:45:59 +08:00
zhansihu
182c815d9d feature(权限点):实现详情查询;实现ID批量查询 2023-09-07 17:13:09 +08:00
陈维伟
4241d1b7da Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1204 2023-09-07 16:29:28 +08:00
陈维伟
c3809b7c7b 接口定义补充缺失字段 2023-09-07 16:29:22 +08:00
zhansihu
3596208d64 Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1204 2023-09-07 16:02:07 +08:00
zhansihu
a3506509c3 refactor(权限点):详情字段扩充;实现树形查询接口 2023-09-07 16:02:00 +08:00
b661403644 add - 添加产品相关 ORM 层 2023-09-07 14:04:15 +08:00
zhansihu
d1c89b7e4d refactor(权限点):DTO调整;增加接口 2023-09-06 20:06:43 +08:00
zhansihu
8ef9910371 Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1204 2023-09-06 16:29:27 +08:00
zhansihu
cb88f99a24 feature(权限点):增加权限点API接口;
refactor(init): 补充依赖,删除示例代码
2023-09-06 16:29:17 +08:00
陈维伟
b8b51e1483 添加角色/分组/权限组相关基础代码 2023-09-06 15:54:46 +08:00
zhansihu
cfc3aa9e4e fix(权限点):删除重复字段 2023-09-06 11:39:04 +08:00
zhansihu
5db09f1883 feature(权限点):新增CRUD 2023-09-06 11:36:43 +08:00
tianliyong
95c18c05b0 初始化调整 2023-08-03 16:16:11 +08:00
tianliyong
bc1a716d2d 代码初始化 2023-08-03 16:14:59 +08:00