DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
408 Commits 1 Branch 0 Tags
92c417912d7ba39c73082f3fe3bc61e1b3cef8f4
Commit Graph
111 Commits
Author SHA1 Message Date
zer0Black 92c417912d 处理日志版本升级问题 2023-08-30 18:11:39 +08:00
zer0Black a2c76c2d3f 用户选择弹框加姓名检索，去掉角色检索 2023-06-29 17:37:11 +08:00
mzaxd daa0000e75 fix:修复Bug数据字典选项重复和强制排序字段 2023-05-26 13:55:36 +08:00
bupengxiang d8d785652b [修改] 用户导入 2023-05-24 11:07:03 +08:00
bupengxiang f9f7f5e141 [修改] 用户批量导入 2023-05-24 09:44:55 +08:00
bupengxiang 36c9516ec1 [修改] 部门查询 2023-05-23 17:36:12 +08:00
bupengxiang f38f5b76f1 [修改] 修改用户页面的bug 2023-05-23 16:45:19 +08:00
mzaxd 3afbfe2375 fix:修复LevelId和EmployeeTypeId判空问题 2023-05-19 14:54:54 +08:00
bupengxiang 09eb8c5171 [修改] 用户列表,角色搜索 2023-05-18 21:11:27 +08:00
xuetao.li 7f91a29346 feat:SSO单点登录功能 2023-05-18 18:20:07 +08:00
xuetao.li e20407f8f0 fix:修复用户数据同步缺失的三个字段 
Level LevelName EmployeeTypeId
 2023-05-18 18:17:42 +08:00
mzaxd a5eba18449 feat:全量同步定时任务 2023-05-18 17:20:49 +08:00
mzaxd a297980511 feat:重新打开浏览器后不丢失登陆状态 
将新的sessionId返回给前端
 2023-05-18 16:59:05 +08:00
bupengxiang f68b6756c1 [修改] 添加用户的手机号验证规则 2023-05-18 14:36:36 +08:00
bupengxiang d9ca17ce3f [修改] 流程中心 2023-05-18 11:25:06 +08:00
bupengxiang 55cfac6509 [修改] 修改用户 ，手机号验证正则 2023-05-18 09:50:32 +08:00
bupengxiang abad378fae Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-18 09:08:02 +08:00
bupengxiang 9b4a5d12f9 [修改] 流程中心 效率优化 2023-05-18 09:07:53 +08:00
xuetao.li ad0b67f76d Merge remote-tracking branch 'origin/lixuetao' into lixuetao 
# Conflicts:
#	adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
 2023-05-17 17:14:05 +08:00
xuetao.li 405d2d0828 同步功能编写完毕 2023-05-17 17:12:37 +08:00
mzaxd 62c6cf3ef5 ci:调整地址，增加日志打印，放开登录接口拦截 2023-05-17 16:39:00 +08:00
mzaxd 71c23c2e1e ci:将sso获取token和sso获取userInfo的链接调整为新版测试地址 2023-05-17 16:39:00 +08:00
mzaxd b1ccfb1b66 feat:单点登录 2023-05-17 16:38:33 +08:00
bupengxiang be5c2ff02c [修改] 查询全部用户 2023-05-17 15:37:35 +08:00
bupengxiang b5b48c16c2 [修改] 用户模板导入 2023-05-17 11:24:12 +08:00
bupengxiang 39e8848eb7 [修改] 修改用户时 修改密码问题 2023-05-17 09:20:56 +08:00
bupengxiang 70f1e89629 [修改] userEomapper 2023-05-16 20:10:21 +08:00
bupengxiang 5e5ecd9583 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 
# Conflicts:
#	adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java
 2023-05-16 19:03:09 +08:00
bupengxiang e56bdf3d32 [修改] 组织管理模块 2023-05-16 19:01:36 +08:00
mzaxd aa80c5da1f fix:修复组织机构管理不显示数据BUG 2023-05-16 18:45:37 +08:00
xuetao.li d75607102a 修复秘钥生产的url传递错误问题 2023-05-16 18:37:24 +08:00
bupengxiang a45b96b820 [修改] orgEopage 2023-05-16 18:30:54 +08:00
mzaxd a9bc15b5eb ci:修改UserEOMapper中的数据库字段 2023-05-16 18:28:25 +08:00
mzaxd d7ab68933a ci:修改ORG实体类 2023-05-16 18:22:24 +08:00
bupengxiang 28fb15382e [修改] UserEOMapper.xml 2023-05-16 18:12:23 +08:00
mzaxd c00e431bed ci:将部分orgCode改为DepartmentCode 2023-05-16 18:08:10 +08:00
xuetao.li 5219263cae 移除误提交的target 2023-05-16 18:00:07 +08:00
bupengxiang ac6129e9c3 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 17:55:30 +08:00
bupengxiang 479cf83506 [修改] orgEomapper 2023-05-16 17:55:23 +08:00
xuetao.li 71fdf48fe0 转换org问题完毕 2023-05-16 17:51:55 +08:00
xuetao.li 40e7e67760 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 17:41:48 +08:00
xuetao.li 8b9ad09c48 同步测试，修改org表 2023-05-16 17:29:40 +08:00
bupengxiang d5a8df76a1 [修改] 监控流程审核历史 2023-05-16 17:13:54 +08:00
mzaxd 0106517804 fix:修复[角色管理-保存的权限显示不正确]Bug 2023-05-16 16:35:22 +08:00
bupengxiang 89e829781e [修改] isAct 2023-05-16 16:17:24 +08:00
bupengxiang 6e6ce8f49a Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 15:34:34 +08:00
bupengxiang ba11a47341 [修改] 部门修改 修改编码 2023-05-16 15:34:19 +08:00
mzaxd a5e11115d3 ci:menu新增字段及相应逻辑 2023-05-16 15:10:37 +08:00
bupengxiang 103ff19650 [修改] 添加编辑用户 部门回显 2023-05-16 15:07:52 +08:00
bupengxiang fcdcea3afc [修改] 修改 转办 与审批历史 2023-05-16 11:46:20 +08:00