罗福
|
0e71b5c016
|
Merge branch 'hotfix/20250424' into 'master'
add(hotfix/20250424) 设置isDelete
See merge request universal/infrastructure/backend/orgmanax!279
|
2025-04-25 06:01:05 +00:00 |
|
zhangran
|
382bc3a0be
|
add(hotfix/20250424) 设置isDelete
|
2025-04-24 19:40:03 +08:00 |
|
谭杰
|
46d3d74f1c
|
Merge branch 'feature/REQ-3714' into 'master'
Feature/req 3714
See merge request universal/infrastructure/backend/orgmanax!277
|
2025-04-10 05:50:29 +00:00 |
|
zhanghonghao
|
27b4fc2699
|
feat(REQ-3714): 把删除的人过滤掉
|
2025-04-09 20:01:48 +08:00 |
|
zhanghonghao
|
3ef0b06d61
|
feat(REQ-3714): 如果人被删了，就提示重新操作
|
2025-04-09 19:55:00 +08:00 |
|
谭杰
|
b2c4a7c1ee
|
Merge branch 'feature/REQ-3714' into 'master'
Feature/req 3714
See merge request universal/infrastructure/backend/orgmanax!274
|
2025-03-26 03:46:51 +00:00 |
|
zhangran
|
2bf1462388
|
add(feature/REQ-3714) 优化update,减少历史工种重复保存
|
2025-03-21 14:29:39 +08:00 |
|
zhangran
|
ddacfb236c
|
add(feature/REQ-3714) 判空，删除工种
|
2025-03-21 11:55:28 +08:00 |
|
zhangran
|
bb233e3c0d
|
Merge remote-tracking branch 'origin/feature/REQ-3714' into feature/REQ-3714
|
2025-03-21 10:30:30 +08:00 |
|
zhangran
|
00d124580f
|
add(feature/REQ-3714) 增加删除工种redis锁
|
2025-03-21 10:30:23 +08:00 |
|
zhanghonghao
|
664d5694d2
|
feat(REQ-3714): 获取角色后使用身份id做一次过滤
|
2025-03-20 15:19:28 +08:00 |
|
zhangran
|
818247a5cd
|
Merge remote-tracking branch 'origin/feature/REQ-3714' into feature/REQ-3714
|
2025-03-20 11:09:55 +08:00 |
|
zhangran
|
0f213baf6a
|
add(feature/REQ-3714) 移除平台工人时，同时终止工人入场申请
|
2025-03-20 11:09:47 +08:00 |
|
zhanghonghao
|
bc999a5035
|
feat(REQ-3714): 调整班组长判断顺序，和当前人的判断
|
2025-03-17 10:48:09 +08:00 |
|
zhanghonghao
|
0985708ba7
|
feat(REQ-3714): 无用的引入处理
|
2025-03-14 16:55:29 +08:00 |
|
zhanghonghao
|
333f782554
|
feat(REQ-3714): 不在管辖范围优先提示
|
2025-03-14 16:30:39 +08:00 |
|
zhanghonghao
|
c9309f5ad7
|
feat(REQ-3714): 处理多个班组长的情况
|
2025-03-14 11:44:48 +08:00 |
|
zhanghonghao
|
8f1cc335be
|
feat(REQ-3714): 更新org_user加上锁
|
2025-03-14 10:20:16 +08:00 |
|
zhanghonghao
|
ad22076462
|
feat(REQ-3714): 处理管辖范围
|
2025-03-13 18:09:05 +08:00 |
|
zhanghonghao
|
15648e026f
|
feat(REQ-3714): 处理班组长提示
|
2025-03-13 15:56:42 +08:00 |
|
zhanghonghao
|
2ed02cd04c
|
feat(REQ-3714): 协同关系查询下级节点
|
2025-03-13 14:38:36 +08:00 |
|
zhanghonghao
|
743b36fd4e
|
feat(REQ-3714): 优化不在组织内
|
2025-03-13 12:50:52 +08:00 |
|
zhanghonghao
|
4c54f73e88
|
feat(REQ-3714): 处理操作组织查询
|
2025-03-13 12:48:28 +08:00 |
|
zhanghonghao
|
56bfc838cb
|
feat(REQ-3714): 处理组织权限查询
|
2025-03-13 12:45:48 +08:00 |
|
zhanghonghao
|
35bca70644
|
feat(REQ-3714): 处理组织权限查询
|
2025-03-13 11:40:48 +08:00 |
|
zhanghonghao
|
cae7d05157
|
feat(REQ-3714): 不过滤当前操作人
|
2025-03-12 21:28:18 +08:00 |
|
zhanghonghao
|
04bf864e93
|
feat(REQ-3714): 不过滤当前操作人
|
2025-03-12 21:14:43 +08:00 |
|
zhanghonghao
|
f4a85a986f
|
feat(REQ-3714): 处理项目内工人退场和发送mq删除
|
2025-03-12 17:17:14 +08:00 |
|
zhanghonghao
|
a3bce5367e
|
feat(REQ-3714): 处理项目内工人退场
|
2025-03-12 16:23:58 +08:00 |
|
zhangran
|
25e1513168
|
add(feature/REQ-3714) 判空
|
2025-03-12 15:44:11 +08:00 |
|
zhanghonghao
|
796108914b
|
feat(REQ-3714): 处理项目内工人退场
|
2025-03-12 15:38:47 +08:00 |
|
luofu
|
517a5c25bc
|
feat(REQ-3714) 工人退场流程优化 - xxl-job config
|
2025-03-12 15:08:00 +08:00 |
|
zhanghonghao
|
12f3d89efd
|
feat(REQ-3714): 处理管理员校验
|
2025-03-12 14:50:24 +08:00 |
|
zhanghonghao
|
89f2f81692
|
feat(REQ-3714): 处理job为空的情况
|
2025-03-12 14:08:10 +08:00 |
|
luofu
|
90ff9f1f70
|
feat(REQ-3714) 工人退场流程优化 - 工人自动打离场标签以及取消标签的XXL-JOB
|
2025-03-12 11:50:36 +08:00 |
|
zhanghonghao
|
04a13c9741
|
feat(REQ-3714): 人员查询异常处理
|
2025-03-12 11:40:00 +08:00 |
|
zhanghonghao
|
8e111ebbae
|
feat(REQ-3714): 人员不在管辖范围
|
2025-03-12 10:24:37 +08:00 |
|
luofu
|
2ad2378ab1
|
feat(REQ-3714) 工人退场流程优化 - 工人自动打离场标签以及取消标签的XXL-JOB
|
2025-03-12 09:50:01 +08:00 |
|
zhanghonghao
|
59a0daf3bf
|
feat(REQ-3714): 更改提示
|
2025-03-12 09:48:34 +08:00 |
|
zhanghonghao
|
4187120b6b
|
feat(REQ-3714): 判断是小组长
|
2025-03-11 19:45:37 +08:00 |
|
zhanghonghao
|
6571282886
|
feat(REQ-3714): 处理人员删除检测
|
2025-03-11 19:37:34 +08:00 |
|
zhanghonghao
|
cf1fef29ee
|
feat(REQ-3714): 处理启动问题
|
2025-03-11 18:58:30 +08:00 |
|
zhanghonghao
|
73f158b4fb
|
feat(REQ-3714): 修改编译问题
|
2025-03-11 18:49:05 +08:00 |
|
zhanghonghao
|
40852c840a
|
feat(REQ-3714): 修改提示
|
2025-03-11 18:05:13 +08:00 |
|
zhangran
|
e5a9252ce7
|
add(feature/REQ-3714) 工人退出班组消息、去掉权限、设置岗位
|
2025-03-11 15:56:44 +08:00 |
|
luofu
|
9b4dfab87f
|
feat(REQ-3714) 工人退场流程优化 - 人员打标签流程迁移
|
2025-03-11 15:37:44 +08:00 |
|
zhanghonghao
|
db6eaf84cc
|
feat(REQ-3714): orgUser更新填充值
|
2025-03-11 14:53:53 +08:00 |
|
zhanghonghao
|
49167a2ee1
|
feat(REQ-3714): 如果传了nodeId就用传进来的ouId
|
2025-03-11 14:15:44 +08:00 |
|
zhanghonghao
|
e7544c7b35
|
feat(REQ-3714): 处理平台班组删除人员
|
2025-03-11 13:48:56 +08:00 |
|
zhanghonghao
|
de4f798cc0
|
feat(REQ-3714): 提交删除人员前置请求
|
2025-03-11 13:38:22 +08:00 |
|