176yunxuan
|
84d3ccc5af
|
fix:我负责我管理我参与的项目查询重构以及项目增加,系统模块数据表增加截止时间和状态字段
|
2024-04-17 17:03:35 +08:00 |
|
|
|
a2cd19675e
|
refactor: 对权限组的重新配置
|
2024-04-16 23:56:20 +08:00 |
|
|
|
b368dadc3c
|
fix：调整权限验证逻辑，修复访问空指针问题，优化日志信息，调整审核查询接口字段名称，修正查询接口分页问题。
|
2024-04-16 21:59:39 +08:00 |
|
|
|
49bcadd483
|
Merge branch 'develop' into feature-jie
代码检查 / 代码检查 (pull_request) Successful in 20s
|
2024-04-16 21:39:54 +08:00 |
|
176yunxuan
|
7db82c57e2
|
bug:消息修改
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-16 19:40:05 +08:00 |
|
xiangZr-hhh
|
f3840de509
|
Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx
# Conflicts:
# src/main/java/com/jsl/oa/controllers/ReviewController.java
# src/main/java/com/jsl/oa/dao/ProjectDAO.java
# src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
|
2024-04-16 19:30:09 +08:00 |
|
|
|
7b1cead10e
|
refactor: 更新代码以处理未登录异常，优化角色筛选方式，并准备安全相关内容。
|
2024-04-16 16:44:41 +08:00 |
|
|
|
f153eb221e
|
Merge branch 'refs/heads/master' into feature-xiaolfeng
# Conflicts:
# src/main/java/com/jsl/oa/controllers/AuthController.java
# src/main/java/com/jsl/oa/utils/Processing.java
|
2024-04-16 15:03:26 +08:00 |
|
xiangZr-hhh
|
bc545bbd76
|
Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx
# Conflicts:
# src/main/java/com/jsl/oa/mapper/ProjectMapper.java
# src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
|
2024-04-16 14:31:33 +08:00 |
|
|
|
327f26fc30
|
refactor：将Role对象替换为String类型以简化代码。
代码检查 / 代码检查 (push) Failing after 20s
|
2024-04-15 16:17:06 +08:00 |
|
|
|
0eaf43c764
|
refactor: 修改用户服务实现，角色筛选由ID变更为名称
代码检查 / 代码检查 (push) Failing after 21s
|
2024-04-15 13:41:19 +08:00 |
|
|
|
fd22ba9dc6
|
feat: 新增从项目 id 获取项目详细信息的接口，并实现
|
2024-04-14 16:15:22 +08:00 |
|
|
|
aa9efbcc8b
|
patch: 补丁
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-14 14:54:46 +08:00 |
|
xiangZr-hhh
|
ec45c0b233
|
feat：增加新业务功能修改审核状态
代码检查 / 代码检查 (pull_request) Successful in 19s
|
2024-04-12 14:28:28 +08:00 |
|
|
|
061d469c17
|
Merge branch 'refs/heads/develop' into feature-zrx
# Conflicts:
# src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java
# src/main/java/com/jsl/oa/common/constant/SafeConstants.java
# src/main/java/com/jsl/oa/controllers/PermissionController.java
# src/main/java/com/jsl/oa/controllers/ProjectController.java
# src/main/java/com/jsl/oa/controllers/RoleController.java
# src/main/java/com/jsl/oa/controllers/UserController.java
# src/main/java/com/jsl/oa/dao/ProjectDAO.java
# src/main/java/com/jsl/oa/dao/RoleDAO.java
# src/main/java/com/jsl/oa/dao/UserDAO.java
# src/main/java/com/jsl/oa/mapper/ProjectMapper.java
# src/main/java/com/jsl/oa/mapper/RoleMapper.java
# src/main/java/com/jsl/oa/mapper/UserMapper.java
# src/main/java/com/jsl/oa/services/ProjectService.java
# src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
# src/main/java/com/jsl/oa/utils/Processing.java
|
2024-04-11 20:17:32 +08:00 |
|
|
|
5f0e58ab06
|
feat: 代码规约修改，BUG 补丁
代码检查 / 代码检查 (pull_request) Successful in 19s
|
2024-04-11 19:31:16 +08:00 |
|
xiangZr-hhh
|
365f2dfa67
|
feat：增加新业务功能获取审核列表
代码检查 / 代码检查 (pull_request) Failing after 21s
|
2024-04-11 17:27:34 +08:00 |
|
|
|
fb5a8c06f6
|
feat: 代码风格规约调整
代码检查 / 代码检查 (pull_request) Failing after 27s
|
2024-04-10 10:34:55 +08:00 |
|
|
|
c273913442
|
feat: 代码风格调整
代码检查 / 代码检查 (pull_request) Failing after 19s
|
2024-04-10 09:37:39 +08:00 |
|
176yunxuan
|
61a4e2e592
|
返回信息调整
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-16 10:19:56 +08:00 |
|
xiangZr-hhh
|
ef85c9fb60
|
项目文件接口
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-14 17:35:19 +08:00 |
|
xiangZr-hhh
|
935003c126
|
用户信息获取接口添加角色控制
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
项目编辑、删除
|
2024-03-12 11:24:25 +08:00 |
|
176yunxuan
|
2494fb38b6
|
项目查询和新增
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-10 17:36:13 +08:00 |
|
|
|
c9dfeabeb4
|
patch: 修补输出结构
|
2024-01-24 20:02:45 +08:00 |
|
|
|
c4972a2af6
|
patch: 日志修补，缓存模块，标准化开发
|
2024-01-23 19:24:13 +08:00 |
|
|
|
1a12bcc49d
|
patch: 日志修补，增加Redis
|
2024-01-23 16:50:22 +08:00 |
|
|
|
73cea8544b
|
feat&fix: 注解权限控制处理，日志补丁
|
2024-01-23 11:58:00 +08:00 |
|
|
|
377261e938
|
patch: 权限板块日志补丁
|
2024-01-22 19:09:40 +08:00 |
|
|
|
9e8eea81b2
|
fix: 简单补丁
|
2024-01-21 23:56:21 +08:00 |
|
xiangZr-hhh
|
dbcb984199
|
改变项目模块对应用户接口
|
2024-01-21 13:46:21 +08:00 |
|
xiangZr-hhh
|
fef2ed6611
|
项目分割模块编辑接口
|
2024-01-21 12:56:00 +08:00 |
|
|
|
91045653ad
|
feat&fix: 用户删除处理与补丁
|
2024-01-20 23:10:22 +08:00 |
|
xiangZr-hhh
|
eb2caee36a
|
Merge remote-tracking branch 'origin/master'
|
2024-01-20 21:41:40 +08:00 |
|
xiangZr-hhh
|
032ed1de01
|
权限删除接口、消息删除接口
|
2024-01-20 21:31:01 +08:00 |
|
|
|
1de2e0a49f
|
fix: 日志模块补丁
|
2024-01-20 18:11:10 +08:00 |
|
|
|
fc51326449
|
fix: Auth信息规整修改，Current(All)信息返回修改，日志补丁
|
2024-01-20 16:15:14 +08:00 |
|
xiangZr-hhh
|
7be9ac3302
|
新增权限获取接口、权限编辑接口
|
2024-01-20 15:28:53 +08:00 |
|
xiangZr-hhh
|
07cf979b42
|
修正rolechangeUser漏洞，新增获取推荐用户接口
|
2024-01-20 14:00:31 +08:00 |
|
|
|
92e6c2b0a7
|
fix&todo: ClassCopyException补丁优化，张：roleChangeUser部分存在漏洞
|
2024-01-20 00:38:12 +08:00 |
|
|
|
26b58e3871
|
fix: ClassCopyException 捕获处理
|
2024-01-20 00:24:22 +08:00 |
|
|
|
e65efd1883
|
fix: 项目优选重新补丁
|
2024-01-20 00:06:30 +08:00 |
|
|
|
c49c96290a
|
fix: 跨域放行准则
|
2024-01-19 21:55:26 +08:00 |
|
|
|
e0b4e02acc
|
feat&fix: 轮播图、日志补丁
|
2024-01-19 18:15:14 +08:00 |
|
176yunxuan
|
e93cf90d5b
|
权限
|
2024-01-19 17:02:53 +08:00 |
|
xiangZr-hhh
|
26cb8ea28d
|
添加权限
|
2024-01-19 16:24:09 +08:00 |
|
|
|
9ffdf3d33c
|
Role修改以及日志模块
|
2024-01-19 14:27:10 +08:00 |
|
|
|
a4a95d66b3
|
内容补丁
|
2024-01-18 17:49:10 +08:00 |
|
xiangZr-hhh
|
58343a8aed
|
用户编辑、用户添加、查询用户信息接口
|
2024-01-18 16:52:53 +08:00 |
|
|
|
1dd56d4690
|
移动管理员权限检查
|
2024-01-18 15:26:34 +08:00 |
|
|
|
955bdc5552
|
UserAllCurrent
|
2024-01-18 14:32:56 +08:00 |
|
