Commit Graph

192 Commits (b9d8f32efaa246dd13738908b78a0e0d9c5f0012)

Author SHA1 Message Date
zhaokai ba47d2324f Merge remote-tracking branch 'origin/dev' into dev 2026-07-28 18:07:06 +08:00
zhaokai 1ce6637c07 Merge branch 'dev_visual_page' into dev 2026-07-28 18:06:53 +08:00
zhangxiongfeng 9bb96f109d Merge branch 'dev' of http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_basic_info_gwj into komen 2026-07-28 15:29:24 +08:00
zhaokai 0feb06ba0d feat(CorpInfoController): 添加查询当前登录租户企业详情接口 2026-07-28 11:20:52 +08:00
zhaokai ef0dddf572 Merge branch 'dev_visual_page' into dev 2026-07-28 11:20:06 +08:00
zhaokai 88f58d580f feat(CorpInfoController): 添加查询当前登录租户企业详情接口 2026-07-28 11:19:46 +08:00
zhangxiongfeng 65ad2b538e 大华口门对接 2026-07-28 10:33:46 +08:00
zhaokai a6c3aab30c Merge branch 'dev_visual_page' into dev 2026-07-27 15:13:27 +08:00
zhaokai 816d82f23e feat(img-files): 添加图片文件删除接口
- 新增 getDelete 接口用于删除单个图片文件
- 新增 getIds 接口用于批量删除图片文件

(cherry picked from commit 8ff5a19654)
2026-07-22 09:06:17 +08:00
zhaokai 35c9818f2c feat(corp): 为可视化大屏新增企业列表接口 2026-07-21 08:54:53 +08:00
zhaokai 8f7f5201ea feat(corp): 为可视化大屏企业用户汇总接口添加查询参数支持 2026-07-20 14:10:13 +08:00
zhaokai 81d080562c Merge branch 'dev_visual_page' into dev 2026-07-17 15:28:42 +08:00
zhaokai 2aa7777dfc feat(corp): 添加可视化大屏-企业用户汇总统计功能 2026-07-17 15:28:02 +08:00
zhaokai 176011e6f4 Merge branch 'dev_visual_page' into dev
# Conflicts:
#	web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
2026-07-17 14:52:37 +08:00
zhaokai fdd5bc8605 feat(corp): 添加可视化大屏-企业部门用户统计数据接口 2026-07-17 14:49:55 +08:00
zhaokai 5dd3e1b7da feat(user): 更新用户信息时同步用户状态标识
- 优化部门名称更新逻辑确保信息一致性
- 添加员工状态变更标志更新方法
- 重构用户更新命令参数处理逻辑
2026-07-14 16:00:32 +08:00
zhaokai 33e3598981 fix(user): 修复用户离职处理中的角色设置和删除操作 2026-06-30 17:50:36 +08:00
zhaokai 0c8e1cf6e4 refactor(config): 更新配置文件和用户门面实现 2026-06-25 15:48:07 +08:00
zhaokai a21668bde4 feat(user): 添加用户变更记录中的姓名字段并实现跨企业变更功能 2026-06-23 16:38:12 +08:00
zhaokai b43696469c feat(corp): 添加企业用户统计功能和优化用户变更记录处理,添加用户离职工作交接工作 2026-06-23 10:05:35 +08:00
zhaokai 4ce5bb5723 chore(build): 清理项目构建配置和依赖文件 2026-06-15 17:23:25 +08:00
zhaokai 54277f8d61 Merge remote-tracking branch 'refs/remotes/origin/main' into dev_human_push
# Conflicts:
#	web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java
#	web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
#	web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java
#	web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java
2026-06-15 16:52:54 +08:00
zhaokai 31d925e7e7 feat(department): 添加免权限的企业部门树查询功能 2026-06-10 17:11:06 +08:00
zhaolei e8dd6891c9 修改新增用户-暂定用于人资数据同步接口添加返回值用户id 2026-06-10 10:05:59 +08:00
zhaolei bc56292e89 添加部门保存接口-用于人力资源部门保存 2026-06-10 09:13:04 +08:00
zhaolei c4fdfe4af3 添加用户保存接口-用于人力资源用户保存 2026-06-10 09:12:32 +08:00
zhaokai 1b4eec74c5 feat(department): 添加免权限的企业部门树查询功能 2026-06-10 09:03:38 +08:00
zhaolei b5efa87f30 Revert "添加部门保存接口-用于人力资源部门保存"
This reverts commit 4fc90fa653.
2026-06-10 08:59:33 +08:00
zhaolei 4dd7a1a39d Revert "添加用户保存接口-用于人力资源用户保存"
This reverts commit b78348262b.
2026-06-10 08:59:30 +08:00
zhaolei b78348262b 添加用户保存接口-用于人力资源用户保存 2026-06-09 17:19:45 +08:00
zhaolei 4fc90fa653 添加部门保存接口-用于人力资源部门保存 2026-06-09 17:19:15 +08:00
zhaokai 5ed43e8fc3 feat(img-files): 添加文件上传功能接口实现 2026-06-02 14:37:35 +08:00
zhangyue 0728fd588e 相关方人员字段增加 2026-05-26 15:59:52 +08:00
zhangyue 5bf71ab9da 增加演示登录注册接口 2026-05-07 15:16:12 +08:00
zhangyue dffa4bf3a8 统一异常处理并修正数据类型 2026-04-24 15:42:41 +08:00
zhangyue 5b2284d2f5 开启aop 2026-04-24 13:46:30 +08:00
zhangyue 76d0b5f0b7 添加同步信息功能实现分页查询接口 2026-04-24 11:44:35 +08:00
zhangyue 9dd1fb1e4c 添加企业及其下级数据删除功能 2026-04-17 15:56:41 +08:00
zhangyue 97d23b58eb 添加图片文件Base64格式接口功能 2026-04-14 17:17:46 +08:00
zhangyue 5381c299e6 实现用户管理功能增强与企业类型密码策略 2026-04-13 14:32:51 +08:00
zhangyue da25463bf9 添加图片文件批量删除功能
修改部门判重规则
2026-03-30 11:11:09 +08:00
zhaokai f9ce6d28d0 feat(corp): 添加企业列表排除自身功能 2026-03-02 15:29:02 +08:00
zhaokai a6bbdb3398 feat(corp): 添加企业,部门新增雪花id传入参数 2026-03-02 13:58:22 +08:00
zhaokai fa7643edd4 feat(img-files): 添加图片路径配置功能 2026-02-27 11:50:40 +08:00
zhangyue bfc8525bdb 添加按用户名查询用户的V1版本接口 2026-02-11 18:08:15 +08:00
zhangyue 92fcaa1075 添加文件保存功能实现 2026-02-05 17:46:04 +08:00
zhangyue 77d5103605 添加文件保存dubbo接口 2026-02-02 16:31:29 +08:00
zhangyue 54f8586d1f 添加Base64文件上传支持并扩展企业类型查询功能 2026-02-02 09:28:01 +08:00
zhangyue db11455f6c 添加用户名查询用户信息功能 2026-01-23 14:39:20 +08:00
zhaokai 5c50425e96 Merge remote-tracking branch 'origin/main' 2026-01-22 09:32:30 +08:00