zcloud_gbs
/
zcloud_gbs_basic_info_gwj
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
607 Commits
15 Branches
0 Tags
6.9 MiB
Commit Graph

352 Commits (b50e4e108265c882daa55883161c16e1d1040be0)

Author SHA1 Message Date
zhangyue b50e4e1082 Merge remote-tracking branch 'origin/dahua_koumen' into dev 2026-08-13 10:11:37 +08:00
zhangxiongfeng 208ddf73ac 2026/8/13 2026-08-13 09:37:45 +08:00
zhangyue a624f68f50 适配系统管理配置 2026-08-12 16:55:06 +08:00
zhangyue 49d840ea7d Merge branch 'dev_sys_config' into dev 
# Conflicts:
#	web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
#	web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java
#	web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
#	web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
#	web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
 2026-08-12 15:59:03 +08:00
zhangyue dd02f40658 临时提交一级租户主账号功能 2026-08-12 15:35:06 +08:00
zhaokai e682dc86e6 feat(user): 更新用户管理功能以支持大华系统集成 
条件
- 实现大华人脸图片的下载和Base64转换功能
- 添加文件服务URL配置注入和使用
- 优化大华系统数据同步的日志记录和错误处理
 2026-08-12 15:20:24 +08:00
zhaokai 68b225d42a Merge branch 'dahua_koumen' into main_koumen 
# Conflicts:
#	web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
 2026-08-11 19:20:04 +08:00
zhangxiongfeng af5c37decf 人员变动查询大华接口 2026-08-11 18:52:59 +08:00
zhaokai a0db881b2c refactor(user): 优化用户增删操作的大华同步机制 
sdk生产环境配置引用
 2026-08-07 21:28:17 +08:00
zhangxiongfeng 4d1c5ef0ad 人员变动取消和大华强制同步 2026-08-06 10:28:49 +08:00
zhangyue 2a7772352c 适配系统管理配置 2026-08-05 15:52:35 +08:00
zhangxiongfeng a75871b388 大华口门对接1.1 
(cherry picked from commit 65ad2b538e)
 2026-08-05 09:10:11 +08:00
zhangxiongfeng 285764928c 大华口门对接1.0 
(cherry picked from commit 65ad2b538e)
 2026-08-04 16:32:38 +08:00
zhangxiongfeng 3ef3dca48b 大华口门对接 
(cherry picked from commit 65ad2b538e)
 2026-08-04 14:53:06 +08:00
zhangxiongfeng ae529ebcac 大华口门对接 
(cherry picked from commit 65ad2b538e)

# Conflicts:
#	web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
#	web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java
#	web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
 2026-08-04 14:52:34 +08:00
zhangxiongfeng b7ba5e46c2 大华口门对接 
(cherry picked from commit 65ad2b538e)
 2026-08-04 14:51:08 +08:00
lishiwei 38ce347a06 feat: 优化修改密码逻辑 2026-08-03 14:41:52 +08:00
zhangxiongfeng c83d18b8a1 大华口门部门id修改 2026-08-03 10:51:53 +08:00
zhangxiongfeng 604d96b3fa 大华口门对接 2026-07-29 17:15:00 +08:00
zhangxiongfeng ac94e9fe88 大华口门对接 2026-07-28 18:25:57 +08:00
zhangxiongfeng bcb9d32b95 大华口门对接 2026-07-28 16:58:06 +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
zhangxiongfeng 8beed9d73d 大华口门对接 2026-07-28 15:29:07 +08:00
lishiwei 3b940c0619 feat: 优化修改密码逻辑 2026-07-28 14:29:20 +08:00
zhangxiongfeng 65ad2b538e 大华口门对接 2026-07-28 10:33:46 +08:00
zhangxiongfeng 2cc429996f Merge remote-tracking branch 'origin/dev' into komen 2026-07-28 08:43:16 +08:00
zhaokai a6c3aab30c Merge branch 'dev_visual_page' into dev 2026-07-27 15:13:27 +08:00
zhaokai c4da5decd4 feat(corp): 添加港区信息字段并优化用户统计查询 2026-07-24 15:07:57 +08:00
zhaokai 2467f7327e fix(user): 修复九公司标识设置逻辑 
- 移除九公司配置ID验证逻辑
- 直接将九公司标识设置为true
 2026-07-21 13:33:59 +08:00
zhaokai 8f7f5201ea feat(corp): 为可视化大屏企业用户汇总接口添加查询参数支持 2026-07-20 14:10:13 +08:00
zhaokai 1eb129d61d feat(config): 修改九公司配置支持多公司ID 2026-07-20 12:18:01 +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 cf36acaea9 feat(user): 添加九公司用户标识功能 
(cherry picked from commit ba4945e651)
 2026-07-14 09:54:20 +08:00
zhaokai ba4945e651 feat(user): 添加九公司用户标识功能 2026-07-13 13:54:29 +08:00
zhaokai c631087511 chore(build): 人资对接调整，未测试 2026-07-13 10:43:15 +08:00
zhaokai 4e66d236d9 chore(build): 修改日志 2026-07-09 16:16:54 +08:00
zhaokai 97d6d2f1fe chore(build): 导入用户添加身份证和人员类型 2026-07-09 15:32:29 +08:00
zhaokai 33e3598981 fix(user): 修复用户离职处理中的角色设置和删除操作 2026-06-30 17:50:36 +08:00
zhaokai fde7cb5c2d feat(workflow): 集成线下培训系统的工作交接功能 2026-06-25 09:53:33 +08:00
zhaokai 545b2d5839 feat(job-handover): 新增专项领域和科技兴安待交接任务处理 2026-06-23 17:40:27 +08:00
zhaokai a21668bde4 feat(user): 添加用户变更记录中的姓名字段并实现跨企业变更功能 2026-06-23 16:38:12 +08:00
zhaokai d57c5e9d1c fix(user): 解决用户变更记录和跨企业变更功能问题 2026-06-23 14:42:18 +08:00
zhaokai b43696469c feat(corp): 添加企业用户统计功能和优化用户变更记录处理,添加用户离职工作交接工作 2026-06-23 10:05:35 +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 5662a0a430 feat(user): 添加部门ID变更检测以同步用户信息 2026-06-15 10:20:32 +08:00
zhaokai 48a1fc8f15 feat(info): 添加经营范围字段并优化图片压缩和身份证附件同步功能 2026-06-11 17:58:54 +08:00