Commit Graph

145 Commits (d5f31da708ae45562d12273b946a281054bcbd2e)

Author SHA1 Message Date
zhaokai 2d63d0715e 离职入职相关 2025-12-04 09:14:31 +08:00
zhaokai f6b859b5d9 离职入职相关 2025-12-03 16:32:54 +08:00
zhaokai 5b6233931f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java
2025-12-03 16:31:47 +08:00
zhaokai 141f6cfed8 离职入职相关 2025-12-03 16:31:02 +08:00
SondonYong 67654360ea Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java
2025-12-03 16:19:01 +08:00
SondonYong 0a2315b30b dev:app入职相关接口 2025-12-03 16:17:58 +08:00
zhaokai a6c6ca6241 离职入职相关 2025-12-03 15:56:59 +08:00
SondonYong ce6f71a9ac dev:app相关接口 2025-12-03 14:00:03 +08:00
zhaokai e0ed80a261 用户离职相关,流动人员,等 2025-12-03 08:19:22 +08:00
SondonYong 6340fc6149 dev:修改 2025-12-02 18:14:42 +08:00
SondonYong f1ddba3960 dev:修改字段 2025-12-02 17:56:40 +08:00
SondonYong dc9840c477 init: 代码初始化:1.用户变更记录,2.用户工作交接 2025-12-02 14:17:33 +08:00
zhaokai e94563be9d 用户添加岗位名称 2025-12-02 10:46:20 +08:00
zhaokai d028887a3c 用户添加是否流动人员标志 2025-12-02 10:15:35 +08:00
SondonYong 06d2957b4f Merge remote-tracking branch 'origin/main' into main 2025-12-01 16:40:44 +08:00
zhaokai 5c683b4d4a 企业增加多选条件及开户人 2025-12-01 16:23:53 +08:00
SondonYong 16e852b061 dev:岗位管理去除是否监管岗位 2025-12-01 15:56:50 +08:00
zhaokai 4cfd50d167 企业添加开户人和选取形式字段 2025-12-01 13:32:04 +08:00
SondonYong d16689e719 Merge remote-tracking branch 'origin/main' into main 2025-12-01 11:36:46 +08:00
SondonYong ee8f8f6a4a dev:新增移动端上传用户人脸照片接口 2025-12-01 11:36:37 +08:00
zhangyue 437880dccd 新增部门dubbo接口增加参数 2025-12-01 11:33:29 +08:00
SondonYong 61b3655b0a dev:文案修改:入职->在职 2025-12-01 10:40:34 +08:00
SondonYong a5aba89f61 dev:新增用户默认入职 2025-12-01 10:37:26 +08:00
SondonYong 2a8632f93c Merge remote-tracking branch 'origin/main' into main 2025-12-01 09:55:23 +08:00
SondonYong 8deab6fdf5 dev:岗位列表查询修改 2025-12-01 09:55:19 +08:00
zhaokai 79f0b075dc 统一用户管理修复 2025-12-01 09:11:35 +08:00
SondonYong 45c6a46e96 dev:人员导入(部门岗位反哺版) 2025-11-29 11:19:37 +08:00
SondonYong 226ada2536 dev:人员导入(部门岗位反哺版) 2025-11-28 16:52:42 +08:00
zhaokai 7579b5790e 修改用户排序 2025-11-28 15:33:19 +08:00
zhaokai e34ed803d7 人员username为空的话,默认手机号 2025-11-28 15:07:14 +08:00
zhaokai 6ad31a5c3f 部门校验名字是否重复 2025-11-28 14:50:52 +08:00
zhaokai 8ba09d4d1d 修改排序及路由 2025-11-28 14:39:03 +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 6709e3dd2a 企业默认时间排序 2025-11-26 15:29:20 +08:00
zhaokai 56b2d17949 部门排序 2025-11-26 14:55:53 +08:00
zhangyue efee0d58ce 修改企业新增 2025-11-25 15:53:57 +08:00
zhangyue a4aa60c540 企业名称查重 2025-11-22 18:00:51 +08:00
zhangyue 9c84548f12 用户批量导入 2025-11-22 17:15:17 +08:00
zhangyue f27fb33063 企业名称验证 2025-11-22 09:27:30 +08:00
zhangyue 29d03cb87f 用户新增 age, birthday, and sex 2025-11-21 17:31:08 +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
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
zhangyue 38a8775824 用户列表查询接口 2025-11-20 11:17:03 +08:00
zhaokai 14a6ffc7d0 企业搜索排序 2025-11-20 10:01:56 +08:00
zhaokai a6131058b2 部门增加所有企业的树状结构 2025-11-19 17:14:13 +08:00