陈维伟
|
829c8759c6
|
fix @value map
|
2023-12-18 21:16:45 +08:00 |
|
陈维伟
|
71efe48d34
|
解决冲突
|
2023-12-18 20:45:02 +08: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 |
|
陈维伟
|
986ba31968
|
更新角色时排除分包负责人等角色
|
2023-12-18 11:49:29 +08:00 |
|
zuoqinbo
|
955002f698
|
bugfix(REQ-1650): 修复无法正确删除角色问题
|
2023-12-11 20:40:00 +08:00 |
|
zuoqinbo
|
f88b8ab8c0
|
bugfix(REQ-1650): 修复无法正确删除角色问题
|
2023-12-11 17:05:20 +08:00 |
|
zuoqinbo
|
e9a0bba204
|
bugfix(REQ-1650): 修复无法正确删除角色问题
|
2023-12-11 16:42:17 +08:00 |
|
zuoqinbo
|
cf2d17b0c6
|
bugfix(REQ-1650): 修复无法正确删除角色问题
|
2023-12-11 11:33:16 +08:00 |
|
陈维伟
|
58bca9dac5
|
fix bug:查询产品列表新增授权类型条件
|
2023-12-09 16:52:00 +08:00 |
|
zuoqinbo
|
f839fd406c
|
bugfix: 修复无法正确删除角色问题
|
2023-12-08 17:41:33 +08:00 |
|
zuoqinbo
|
f2fee86067
|
bugfix: 修复无法正确删除角色问题
|
2023-12-07 16:14:18 +08:00 |
|
陈维伟
|
a88681cd70
|
fix bug:查询产品列表SQL拼接问题
|
2023-12-07 15:50:57 +08:00 |
|
zuoqinbo
|
e15bad7def
|
bugfix: 修复无法正确删除角色问题
|
2023-12-07 15:18:58 +08:00 |
|
zuoqinbo
|
438d322b84
|
bugfix: 修复无法正确删除角色问题
|
2023-12-07 10:18:36 +08:00 |
|
zuoqinbo
|
5e70300272
|
bugfix: 修复无法正确删除角色问题
|
2023-12-06 20:30:58 +08:00 |
|
zuoqinbo
|
23f42e94ec
|
bugfix: 修复无法正确删除角色问题
|
2023-12-06 20:29:54 +08:00 |
|
zuoqinbo
|
6533a0a3c0
|
bugfix: 修复无法正确添加角色问题
|
2023-12-06 18:41:44 +08:00 |
|
zuoqinbo
|
0037e2e8e8
|
feat: REQ-1650 角色名称校验
|
2023-12-06 17:39:40 +08:00 |
|
zuoqinbo
|
1e5991c88a
|
feat: REQ-1650 角色名称校验
|
2023-12-06 17:13:33 +08:00 |
|
陈维伟
|
526564e253
|
实现接口:
删除用户角色关联关系接口
|
2023-12-06 16:20:33 +08:00 |
|
陈维伟
|
5e470575a3
|
实现逻辑:
查询产品详情
代码重构
|
2023-12-05 14:08:43 +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 |
|
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
|
d78d01180c
|
feat: REQ-1650
|
2023-11-30 12:03:33 +08:00 |
|
zuoqinbo
|
d252f9f230
|
feat: REQ-1650
|
2023-11-30 11:45:21 +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 |
|
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
|
4dfb9efbf8
|
feat(role-user): 增加角色用户分页接口
|
2023-11-14 17:06:59 +08:00 |
|
zhansihu
|
666b9344b7
|
refactor(listIdentity): 线程池命名
|
2023-11-13 17:08:11 +08:00 |
|
zhansihu
|
39a89c9f22
|
refactor(listIdentity): 线程池命名
|
2023-11-13 16:29:24 +08:00 |
|
zhansihu
|
a354d44b39
|
refactor(listIdentity): 调整计时；trace跨线程
|
2023-11-13 16:13:58 +08:00 |
|
zhansihu
|
54b2ecf030
|
refactor(listIdentity): 时间分段
|
2023-11-13 14:07:57 +08:00 |
|
zhansihu
|
fbc10c2323
|
refactor(listIdentity): 时间分段
|
2023-11-13 14:07:00 +08:00 |
|
zhansihu
|
390ae73f50
|
refactor(listIdentity): 增加stopwatch；调整线程池
|
2023-11-13 13:49:19 +08:00 |
|
zhansihu
|
66327320a9
|
refactor(listIdentity): 增加stopwatch；调整线程池
|
2023-11-13 11:06:27 +08:00 |
|