 SondonYong
|
45c6a46e96
|
dev:人员导入(部门岗位反哺版)
|
2025-11-29 11:19:37 +08:00 |
 zhaokai
|
bdc6c47493
|
修改用户排序
|
2025-11-28 16:52:35 +08:00 |
|
SondonYong
|
9b98f81d2c
|
dev:人员导入(部门岗位反哺版)
|
2025-11-28 15:41:41 +08:00 |
|
SondonYong
|
5c57c12ea4
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-28 15:39:15 +08:00 |
|
SondonYong
|
eac75ce415
|
dev:人员导入(部门岗位反哺版)
|
2025-11-28 15:39:12 +08:00 |
|
zhaokai
|
6ad31a5c3f
|
部门校验名字是否重复
|
2025-11-28 14:50:52 +08:00 |
|
zhaokai
|
c8f344ebe2
|
根据登录人密码获取查询人手机号和身份证号
|
2025-11-28 14:21:30 +08:00 |
zhangyue
|
f2b527d32a
|
1.修改密码 2.禁用租户
|
2025-11-27 15:03:38 +08:00 |
|
zhaokai
|
b7133bce8e
|
增加时间校验
|
2025-11-26 18:23:56 +08:00 |
|
SondonYong
|
335dc0f6a7
|
dev:代码规范
|
2025-11-24 17:54:10 +08:00 |
|
SondonYong
|
293b215a5f
|
dev:代码规范
|
2025-11-24 17:53:11 +08:00 |
|
SondonYong
|
051deb72b7
|
dev:代码规范
|
2025-11-24 15:47:53 +08:00 |
|
SondonYong
|
3e9f11adcc
|
dev:判断统一社会信用代码是否重复代码优化
|
2025-11-24 10:21:19 +08:00 |
|
zhangyue
|
9c84548f12
|
用户批量导入
|
2025-11-22 17:15:17 +08:00 |
|
zhangyue
|
f27fb33063
|
企业名称验证
|
2025-11-22 09:27:30 +08:00 |
|
SondonYong
|
926a1fc891
|
fixed:新增校验统一社会信用代码是否重复接口;人员资质证书列表新增返回参数
|
2025-11-21 17:14:02 +08:00 |
|
zhangyue
|
ff5cbfb094
|
1.增加重置密码功能
2.增加用户新增验证
|
2025-11-21 15:43:51 +08:00 |
|
zhaokai
|
60028814fc
|
部门树状结构调整格式
|
2025-11-21 11:10:31 +08:00 |
|
SondonYong
|
c00c0c9155
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# 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
|
2025-11-21 10:01:54 +08:00 |
|
zhaokai
|
ee652ca889
|
部门树状结构增加企业名称
|
2025-11-21 09:58:14 +08:00 |
|
SondonYong
|
8e5559c9e0
|
fixed:11976 3端都有 社会统一信用代码没有判重
|
2025-11-21 09:11:15 +08:00 |
|
SondonYong
|
5bbce9f03d
|
fixed:修复bug
|
2025-11-20 17:45:13 +08:00 |
|
SondonYong
|
8d28568da3
|
注释
|
2025-11-20 17:21:32 +08:00 |
|
zhaokai
|
8f2306f76a
|
调整异常
|
2025-11-20 13:31:57 +08:00 |
|
zhaokai
|
4bfbcdb7ab
|
部门调整父部门是0
|
2025-11-20 11:21:16 +08:00 |
|
zhangyue
|
38a8775824
|
用户列表查询接口
|
2025-11-20 11:17:03 +08:00 |
|
zhangyue
|
3f47a0ee18
|
用户列表查询
|
2025-11-20 10:27:34 +08:00 |
|
zhaokai
|
14a6ffc7d0
|
企业搜索排序
|
2025-11-20 10:01:56 +08:00 |
|
zhaokai
|
a6131058b2
|
部门增加所有企业的树状结构
|
2025-11-19 17:14:13 +08:00 |
|
zhaokai
|
f9cf3cda3a
|
部门删除增加岗位验证逻辑
|
2025-11-19 11:34:34 +08:00 |
|
zhaokai
|
a5f29f3bac
|
增加部门负责人
|
2025-11-19 10:35:24 +08:00 |
|
zhangyue
|
7c91d615b5
|
修改新增用户默认值
|
2025-11-18 17:53:56 +08:00 |
|
zhangyue
|
ae0f84b10d
|
gbs底座数据互通
|
2025-11-18 09:04:37 +08:00 |
|
SondonYong
|
c14eb8e8a0
|
dev:代码规范修改
|
2025-11-17 15:00:11 +08:00 |
|
zhaokai
|
56622a7e55
|
去掉redis
|
2025-11-14 13:32:06 +08:00 |
|
SondonYong
|
b01cec1375
|
dev:导出用户修改
|
2025-11-13 10:56:39 +08:00 |
|
SondonYong
|
3cb753d138
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
|
2025-11-10 18:20:40 +08:00 |
|
SondonYong
|
af9b0f4b52
|
dev:人员导入
|
2025-11-10 18:19:27 +08:00 |
|
zhaokai
|
c0e02f7aa7
|
企业逻辑调整
|
2025-11-10 17:10:19 +08:00 |
|
zhaokai
|
9b5e148211
|
部门增加管理角色，企业逻辑调整
|
2025-11-10 16:33:11 +08:00 |
|
SondonYong
|
b0fdf323b3
|
dev:人员导入(未完成)
|
2025-11-10 16:21:06 +08:00 |
|
SondonYong
|
8ea23c9a59
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-10 16:19:44 +08:00 |
|
SondonYong
|
22bb8b4929
|
dev:特种/安全证书修改(未完成)
|
2025-11-10 16:19:31 +08:00 |
|
zhangyue
|
00d9e941a7
|
新增获取当前登录用户信息接口
|
2025-11-10 16:17:47 +08:00 |
|
SondonYong
|
53cec84911
|
dev:岗位管理代码规范
|
2025-11-10 16:02:05 +08:00 |
|
SondonYong
|
bb0bec3639
|
dev:岗位管理去掉关联部门数据权限
|
2025-11-10 14:07:01 +08:00 |
|
SondonYong
|
98b57d9eba
|
dev:特种作业人员管理,安全人员信息管理,人员信息导出接口
|
2025-11-08 17:22:06 +08:00 |
|
zhangyue
|
d92375cbe6
|
删除错误代码
|
2025-11-08 11:17:29 +08:00 |
|
zhangyue
|
0e5bf12b9b
|
完善用户履职记录功能
|
2025-11-08 10:58:30 +08:00 |
|
zhaokai
|
0489ce49dd
|
企业调整
|
2025-11-07 18:33:09 +08:00 |
|
zhaokai
|
16e69a803b
|
企业资质调整
|
2025-11-07 16:27:37 +08:00 |
|
SondonYong
|
dfa3a549f6
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-07 16:22:06 +08:00 |
|
SondonYong
|
b329c67de6
|
dev:人员资格证书管理v1.0
|
2025-11-07 16:22:00 +08:00 |
 dearLin
|
9c7b45c8c8
|
feat:完善获取岗位信息
|
2025-11-07 16:03:11 +08:00 |
|
zhaokai
|
caf1911134
|
调整新增时业务主键为空时，添加默认32位uuid
|
2025-11-07 14:46:03 +08:00 |
|
SondonYong
|
5fdfd00513
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-07 13:50:29 +08:00 |
|
zhaokai
|
cd23dcec04
|
部门删除同步gbs,调整部门树
|
2025-11-07 11:21:32 +08:00 |
|
SondonYong
|
1d88f7444a
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-07 11:07:17 +08:00 |
|
dearLin
|
ec219b6222
|
feat:底座接口使用1.7.0高版本
|
2025-11-07 11:04:36 +08:00 |
huangyuxuan
|
2d957fca4c
|
Merge remote-tracking branch 'origin/main'
|
2025-11-07 11:04:07 +08:00 |
|
huangyuxuan
|
16b5bff83f
|
[新增功能](main)
- 去掉shiro
|
2025-11-07 11:03:46 +08:00 |
|
SondonYong
|
b9a40df3ac
|
dev:岗位管理-代码优化
|
2025-11-07 09:29:49 +08:00 |
|
zhangyue
|
0a306f0e57
|
用户字段修改
增加用户履职日志
|
2025-11-07 09:24:27 +08:00 |
|
zhangyue
|
86c3b18e13
|
用户管理相关功能
|
2025-11-06 18:31:00 +08:00 |
|
dearLin
|
91b4b995d9
|
feat:用户部分代码完善获取人、部门、岗位、企业数据
|
2025-11-06 18:10:14 +08:00 |
|
dearLin
|
eb909fed2a
|
feat:用户部分代码完善获取人、部门、岗位、企业数据
|
2025-11-06 17:17:34 +08:00 |
|
SondonYong
|
0be93af579
|
dev:岗位管理-接口联调
|
2025-11-06 16:25:58 +08:00 |
|
SondonYong
|
f83f8cb323
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java
|
2025-11-06 16:11:52 +08:00 |
|
SondonYong
|
9093b3f3a7
|
dev:岗位管理-接口联调
|
2025-11-06 16:10:13 +08:00 |
|
zhaokai
|
396c045704
|
增加企业用户中台首页接口，企业，部门，岗位，用户，修改和删除时，删除对应redis信息
|
2025-11-06 15:50:51 +08:00 |
|
zhaokai
|
c2caa62360
|
修改部门接口和企业新增接口调整企业类型查询
|
2025-11-06 11:04:51 +08:00 |
|
zhangyue
|
ade0f82cb5
|
用户管理功能
|
2025-11-06 10:12:59 +08:00 |
|
zhaokai
|
e43128d16f
|
修改部门树接口
|
2025-11-05 18:01:45 +08:00 |
|
zhaokai
|
aea60a4e65
|
修改企业和部门接口
|
2025-11-05 17:55:20 +08:00 |
|
SondonYong
|
b22abc889e
|
dev:岗位管理-修改接口逻辑优化
|
2025-11-05 17:34:19 +08:00 |
|
huangyuxuan
|
661c37a0c7
|
Merge remote-tracking branch 'origin/main'
|
2025-11-05 16:46:58 +08:00 |
|
huangyuxuan
|
9ba4a5ffde
|
[问题修复](main)
- 企业管理联调
|
2025-11-05 16:46:46 +08:00 |
|
SondonYong
|
dfda3c995f
|
dev:岗位管理-代码修改
|
2025-11-05 16:42:45 +08:00 |
|
SondonYong
|
cd583ba3c8
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-05 13:46:12 +08:00 |
|
zhaokai
|
fd11ffe72e
|
修改增加企业和部门接口
|
2025-11-05 11:35:58 +08:00 |
|
SondonYong
|
da84291f31
|
dev:岗位管理-代码修改
|
2025-11-05 10:25:56 +08:00 |
|
SondonYong
|
d7e75502ea
|
dev:岗位管理-删除校验文案修改
|
2025-11-04 18:05:17 +08:00 |
|
zhaokai
|
ada3b07031
|
修改部门详情查询
|
2025-11-04 17:40:56 +08:00 |
|
SondonYong
|
e57e750a0d
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-04 17:18:31 +08:00 |
|
SondonYong
|
367cb33c29
|
dev:岗位管理-删除校验;名称重复校验
|
2025-11-04 17:18:28 +08:00 |
|
zhaokai
|
f065ef18ca
|
企业增加停用启用接口
|
2025-11-04 17:09:51 +08:00 |
|
zhaokai
|
e12b513afd
|
企业接口字段调整
|
2025-11-04 15:51:33 +08:00 |
zhangyue
|
6d1c587141
|
初始化user
|
2025-11-04 15:13:56 +08:00 |
|
zhangyue
|
50dc7e9a91
|
删除sysuser
|
2025-11-04 15:12:42 +08:00 |
|
zhaokai
|
78820da98b
|
Merge branch 'main' of http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_basic_info_gwj
|
2025-11-04 14:43:21 +08:00 |
|
zhaokai
|
9aa5b0bc0c
|
部门接口调整
|
2025-11-04 14:43:02 +08:00 |
|
zhangyue
|
420ff0d106
|
附件上传功能
|
2025-11-04 13:55:07 +08:00 |
|
zhaokai
|
a46b8a0e4e
|
部门接口调整
|
2025-11-04 11:25:44 +08:00 |
|
SondonYong
|
08b910630e
|
dev:岗位管理-新增和修改岗位代码修改
|
2025-11-04 11:12:10 +08:00 |
|
huangyuxuan
|
fe2f74ecf4
|
Merge remote-tracking branch 'origin/main'
|
2025-11-04 09:35:44 +08:00 |
|
huangyuxuan
|
6e88b0afd2
|
[新增功能](main)
- 新增企业信息dubbo接口
|
2025-11-04 09:35:36 +08:00 |
|
dearLin
|
940359b98c
|
Merge remote-tracking branch 'origin/main'
|
2025-11-04 09:27:24 +08:00 |
|
dearLin
|
314c4929ad
|
feat:用户部分代码完善
|
2025-11-04 09:27:13 +08:00 |
|
SondonYong
|
c65872f4cc
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-04 09:19:27 +08:00 |
|
SondonYong
|
329cc2f053
|
dev:岗位管理-联查部门名称
|
2025-11-04 09:19:22 +08:00 |