Commit Graph

  • 0e71b5c016 Merge branch 'hotfix/20250424' into 'master' master 罗福 2025-04-25 06:01:05 +0000
  • 382bc3a0be add(hotfix/20250424) 设置isDelete zhangran 2025-04-24 19:40:03 +0800
  • 46d3d74f1c Merge branch 'feature/REQ-3714' into 'master' 谭杰 2025-04-10 05:50:29 +0000
  • 27b4fc2699 feat(REQ-3714): 把删除的人过滤掉 zhanghonghao 2025-04-09 20:01:48 +0800
  • 3ef0b06d61 feat(REQ-3714): 如果人被删了,就提示重新操作 zhanghonghao 2025-04-09 19:55:00 +0800
  • b2c4a7c1ee Merge branch 'feature/REQ-3714' into 'master' 谭杰 2025-03-26 03:46:51 +0000
  • 2bf1462388 add(feature/REQ-3714) 优化update,减少历史工种重复保存 zhangran 2025-03-21 14:29:39 +0800
  • ddacfb236c add(feature/REQ-3714) 判空,删除工种 zhangran 2025-03-21 11:55:28 +0800
  • bb233e3c0d Merge remote-tracking branch 'origin/feature/REQ-3714' into feature/REQ-3714 zhangran 2025-03-21 10:30:30 +0800
  • 00d124580f add(feature/REQ-3714) 增加删除工种redis锁 zhangran 2025-03-21 10:30:23 +0800
  • 664d5694d2 feat(REQ-3714): 获取角色后使用身份id做一次过滤 zhanghonghao 2025-03-20 15:19:28 +0800
  • 818247a5cd Merge remote-tracking branch 'origin/feature/REQ-3714' into feature/REQ-3714 zhangran 2025-03-20 11:09:55 +0800
  • 0f213baf6a add(feature/REQ-3714) 移除平台工人时,同时终止工人入场申请 zhangran 2025-03-20 11:09:47 +0800
  • bc999a5035 feat(REQ-3714): 调整班组长判断顺序,和当前人的判断 zhanghonghao 2025-03-17 10:48:09 +0800
  • 0985708ba7 feat(REQ-3714): 无用的引入处理 zhanghonghao 2025-03-14 16:55:29 +0800
  • 333f782554 feat(REQ-3714): 不在管辖范围优先提示 zhanghonghao 2025-03-14 16:30:39 +0800
  • c9309f5ad7 feat(REQ-3714): 处理多个班组长的情况 zhanghonghao 2025-03-14 11:44:48 +0800
  • 8f1cc335be feat(REQ-3714): 更新org_user加上锁 zhanghonghao 2025-03-14 10:20:16 +0800
  • ad22076462 feat(REQ-3714): 处理管辖范围 zhanghonghao 2025-03-13 18:09:05 +0800
  • 15648e026f feat(REQ-3714): 处理班组长提示 zhanghonghao 2025-03-13 15:56:42 +0800
  • 2ed02cd04c feat(REQ-3714): 协同关系查询下级节点 zhanghonghao 2025-03-13 14:38:36 +0800
  • 743b36fd4e feat(REQ-3714): 优化不在组织内 zhanghonghao 2025-03-13 12:50:52 +0800
  • 4c54f73e88 feat(REQ-3714): 处理操作组织查询 zhanghonghao 2025-03-13 12:48:28 +0800
  • 56bfc838cb feat(REQ-3714): 处理组织权限查询 zhanghonghao 2025-03-13 12:45:48 +0800
  • 35bca70644 feat(REQ-3714): 处理组织权限查询 zhanghonghao 2025-03-13 11:40:48 +0800
  • cae7d05157 feat(REQ-3714): 不过滤当前操作人 zhanghonghao 2025-03-12 21:28:18 +0800
  • 04bf864e93 feat(REQ-3714): 不过滤当前操作人 zhanghonghao 2025-03-12 21:14:43 +0800
  • f4a85a986f feat(REQ-3714): 处理项目内工人退场和发送mq删除 zhanghonghao 2025-03-12 17:17:14 +0800
  • a3bce5367e feat(REQ-3714): 处理项目内工人退场 zhanghonghao 2025-03-12 16:23:58 +0800
  • 25e1513168 add(feature/REQ-3714) 判空 zhangran 2025-03-12 15:44:11 +0800
  • 796108914b feat(REQ-3714): 处理项目内工人退场 zhanghonghao 2025-03-12 15:38:47 +0800
  • 517a5c25bc feat(REQ-3714) 工人退场流程优化 - xxl-job config luofu 2025-03-12 15:08:00 +0800
  • 12f3d89efd feat(REQ-3714): 处理管理员校验 zhanghonghao 2025-03-12 14:50:24 +0800
  • 89f2f81692 feat(REQ-3714): 处理job为空的情况 zhanghonghao 2025-03-12 14:08:10 +0800
  • 90ff9f1f70 feat(REQ-3714) 工人退场流程优化 - 工人自动打离场标签以及取消标签的XXL-JOB luofu 2025-03-12 11:50:23 +0800
  • 04a13c9741 feat(REQ-3714): 人员查询异常处理 zhanghonghao 2025-03-12 11:40:00 +0800
  • 8e111ebbae feat(REQ-3714): 人员不在管辖范围 zhanghonghao 2025-03-12 10:24:37 +0800
  • 2ad2378ab1 feat(REQ-3714) 工人退场流程优化 - 工人自动打离场标签以及取消标签的XXL-JOB luofu 2025-03-12 09:49:45 +0800
  • 59a0daf3bf feat(REQ-3714): 更改提示 zhanghonghao 2025-03-12 09:48:34 +0800
  • 4187120b6b feat(REQ-3714): 判断是小组长 zhanghonghao 2025-03-11 19:45:37 +0800
  • 6571282886 feat(REQ-3714): 处理人员删除检测 zhanghonghao 2025-03-11 19:37:34 +0800
  • cf1fef29ee feat(REQ-3714): 处理启动问题 zhanghonghao 2025-03-11 18:58:30 +0800
  • 73f158b4fb feat(REQ-3714): 修改编译问题 zhanghonghao 2025-03-11 18:49:05 +0800
  • 40852c840a feat(REQ-3714): 修改提示 zhanghonghao 2025-03-11 18:05:13 +0800
  • e5a9252ce7 add(feature/REQ-3714) 工人退出班组消息、去掉权限、设置岗位 zhangran 2025-03-11 15:56:44 +0800
  • 9b4dfab87f feat(REQ-3714) 工人退场流程优化 - 人员打标签流程迁移 luofu 2025-03-11 15:37:44 +0800
  • db6eaf84cc feat(REQ-3714): orgUser更新填充值 zhanghonghao 2025-03-11 14:53:53 +0800
  • 49167a2ee1 feat(REQ-3714): 如果传了nodeId就用传进来的ouId zhanghonghao 2025-03-11 14:15:44 +0800
  • e7544c7b35 feat(REQ-3714): 处理平台班组删除人员 zhanghonghao 2025-03-11 13:48:56 +0800
  • de4f798cc0 feat(REQ-3714): 提交删除人员前置请求 zhanghonghao 2025-03-11 13:38:22 +0800
  • 15997039a8 feat(REQ-3714): 使用topNodeIds查人 zhanghonghao 2025-03-11 11:12:03 +0800
  • bd1367bf01 feat(REQ-3714): 更改注释 zhanghonghao 2025-03-11 10:23:10 +0800
  • 452dabd55a feat(REQ-3714): 更改提示 zhanghonghao 2025-03-11 10:22:27 +0800
  • 472b124888 feat(REQ-3714): 更改提示 zhanghonghao 2025-03-11 09:46:04 +0800
  • 680a081cb4 feat(REQ-3714): 项目内工人退场,不查ouId zhanghonghao 2025-03-11 09:39:34 +0800
  • 2bc32fd0d7 feat(REQ-3714): 处理node_user批量删除返回 zhanghonghao 2025-03-10 20:52:27 +0800
  • 8a57412191 feat(REQ-3714): 处理编译 zhanghonghao 2025-03-10 20:43:22 +0800
  • f4b9603c23 add(feature/REQ-3714) 判断nodeuser为空 zhangran 2025-03-10 20:40:09 +0800
  • 3729d623ed feat(REQ-3714) 工人退场流程优化 - organizational_node_user_extra repository impl luofu 2025-03-10 17:48:33 +0800
  • f9cc9d050c feat(REQ-3714): 处理workspaceCheck zhanghonghao 2025-03-10 17:43:34 +0800
  • 2b4dfa50a8 feat(REQ-3714) 工人退场流程优化 - organizational_node_user_extra迁移 luofu 2025-03-10 16:27:55 +0800
  • 179d6a3914 add(feature/REQ-3714) 退出班组时,区分工种需要物理删或逻辑删除 zhangran 2025-03-10 15:58:48 +0800
  • 4a6dfe1527 feat(REQ-3714): 协同关系查询 zhanghonghao 2025-03-10 15:35:00 +0800
  • 4cde75d030 add(feature/REQ-3714) 添加打印日志 zhangran 2025-03-10 15:12:02 +0800
  • 87355af0be add(feature/REQ-3714) 去掉通用删除人员 zhangran 2025-03-10 15:09:48 +0800
  • a5c6bf29de add(feature/REQ-3714) 删除平台工人工种 zhangran 2025-03-10 15:02:03 +0800
  • fb365d27cd feat(REQ-3714): 协同关系查询 zhanghonghao 2025-03-10 14:11:11 +0800
  • d2433d7fa2 feat(REQ-3714): 处理pom依赖 zhanghonghao 2025-03-10 13:42:50 +0800
  • 0cbf35f1be add(feature/REQ-3714) 引用redisson zhangran 2025-03-10 10:54:49 +0800
  • 7f16ae4d00 add(feature/REQ-3714)删除平台班组成员 zhangran 2025-03-10 10:14:02 +0800
  • ed7e9c7eee Merge branch 'feature/REQ-3714-zhh' into 'feature/REQ-3714' 张弘昊 2025-03-07 09:43:00 +0000
  • f3bb974288 feat(REQ-3714): 加上nodeId的处理 zhanghonghao 2025-03-07 17:42:05 +0800
  • cedc2b1d95 Merge branch 'feature/REQ-3714-zhh' into 'feature/REQ-3714' 张弘昊 2025-03-07 09:36:40 +0000
  • 6870c7857b feat(REQ-3714): 单位操作人权限判断 zhanghonghao 2025-03-07 17:35:29 +0800
  • dc4a894f5f Merge branch 'feature/REQ-3714-zhh' into 'feature/REQ-3714' 张弘昊 2025-03-07 08:56:35 +0000
  • 1a2f8a909a Merge remote-tracking branch 'origin/feature/REQ-3714' into feature/REQ-3714-zhh zhanghonghao 2025-03-07 16:56:14 +0800
  • ee114b0a5e feat(REQ-3714): 项目删除加上ouId zhanghonghao 2025-03-07 16:55:58 +0800
  • cba337d8e1 Merge branch 'feature/REQ-3714-zhh' into 'feature/REQ-3714' 张弘昊 2025-03-07 07:25:29 +0000
  • ddeb46cccb feat(REQ-3714): 枚举加上是否三方的方法 zhanghonghao 2025-03-07 15:24:26 +0800
  • 676ce7344f Merge branch 'feature/REQ-3714-zhh' into 'feature/REQ-3714' 张弘昊 2025-03-07 07:20:48 +0000
  • 61626a7a73 feat(REQ-3714): 调整org_user的mq发送 zhanghonghao 2025-03-07 15:20:24 +0800
  • 23b2eb438b Merge branch 'feature/REQ-3714-zhh' into 'feature/REQ-3714' 张弘昊 2025-03-07 06:52:23 +0000
  • 9ec0d538d3 feat(REQ-3714): 调整发送mq zhanghonghao 2025-03-07 14:52:04 +0800
  • 3d1010fa99 Merge branch 'feature/REQ-3714-zhh' into 'feature/REQ-3714' 张弘昊 2025-03-07 06:41:56 +0000
  • d911db5166 feat(REQ-3714): 批量删除人员检查接口实现 zhanghonghao 2025-03-07 14:40:29 +0800
  • 346d99646e feat(REQ-3714): 提交单位阻断校验逻辑 honghao.zhang 2025-03-07 00:08:10 +0800
  • 230b2fc6b2 feat(REQ-3714): 底座校验接口定义 zhanghonghao 2025-03-06 19:04:16 +0800
  • 442d0ef53d feat(REQ-3714): 底座批量删除node_user处理 zhanghonghao 2025-03-06 16:29:00 +0800
  • e7380710a7 feat(REQ-3714) 工人退场流程优化 - 标签系统API对接 luofu 2025-03-05 16:14:21 +0800
  • 01e2b05443 feat(REQ-3714) 工人退场流程优化 - 考勤记录API对接 luofu 2025-03-05 14:46:42 +0800
  • 28f6b7736c feat(REQ-3714) 工人退场流程优化 - 考勤记录事件MQ处理 luofu 2025-03-05 13:53:19 +0800
  • 83658d7edf Merge branch 'feature/REQ-3488' into 'master' 谭杰 2025-02-19 11:17:31 +0000
  • 3b4e363e61 feat:[REQ-3488] 修复BUG liuyang 2025-02-19 16:43:01 +0800
  • efe60a26d5 Merge branch 'feature/REQ-3488' into 'master' 周敏 2025-02-19 07:54:57 +0000
  • 56d2607fed feat:[REQ-3488] 使用lamda表达式简化方法 liuyang 2025-02-19 15:42:37 +0800
  • 137b993829 feat:[REQ-3488] 修改岗位过滤BUG liuyang 2025-02-19 15:35:52 +0800
  • 873b281d02 feat:[REQ-3648] 独立小组标识,增加默认值 liuyang 2025-02-19 11:37:05 +0800
  • eb798b1771 Merge branch 'release-20250218' into 'master' 谭杰 2025-02-18 02:36:35 +0000
  • 32188cae3f feat:[REQ-3648] 暂时提交 liuyang 2025-02-13 18:45:06 +0800
  • 19c595d056 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 张弘昊 2025-02-10 07:22:25 +0000