Commit Graph

122 Commits

Author SHA1 Message Date
s2042968 536c538400 更改目录树筛选 2025-01-08 16:43:00 +08:00
s2042968 e2e9349dfa 建立关系bug修改 2025-01-08 15:49:01 +08:00
s2042968 3107173133 Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-08 14:49:48 +08:00
s2042968 8b38b46e1d 建立关系,校验失败,返回结果修改 2025-01-08 14:49:37 +08:00
chenxudong 46a3e90ecb clean code 2025-01-08 14:31:34 +08:00
chenxudong 8b23fb63d6 增加用户查询目录树的权限校验 2025-01-08 14:20:33 +08:00
chenxudong 8921286146 优化代码 2025-01-07 17:41:59 +08:00
s2042968 11577ecb20 Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-07 16:49:20 +08:00
s2042968 7f38b45246 角色已绑定后不能作废,功能修改 2025-01-07 16:49:12 +08:00
chenxudong b492520470 删除无用的代码 2025-01-07 16:18:30 +08:00
chenxudong c15261d6d6 增强校验。 2025-01-07 16:03:04 +08:00
chenxudong d738f72db7 Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-07 15:13:57 +08:00
chenxudong 219908b0ba 解决发现的问题 2025-01-07 15:13:49 +08:00
s2042968 8fe9b3e356 Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-07 14:59:01 +08:00
s2042968 ff9ad067f5 人员绑定参数修改 2025-01-07 14:58:32 +08:00
chenxudong 16f8f98b64 暂时去掉权限校验 2025-01-07 14:38:43 +08:00
chenxudong 4f826b7f84 解决已知问题 2025-01-07 13:37:09 +08:00
s2042968 35e62a2c71 增加处理空列表情况 2025-01-07 12:42:03 +08:00
chenxudong 5f52e7f020 解决已知问题 2025-01-07 12:01:11 +08:00
chenxudong ad39488e94 解决发现的问题 2025-01-07 11:17:49 +08:00
chenxudong ccb61bfa40 解决部分问题 2025-01-07 10:45:06 +08:00
s2042968 d0187511bc Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-07 09:38:03 +08:00
s2042968 fa44e8b7da 角色列表,功能权限,英文转换成中文 2025-01-07 09:37:51 +08:00
chenxudong 1acaec87a7 删除无用的代码 2025-01-07 09:36:29 +08:00
chenxudong 6435d002cd 解决已知问题 2025-01-07 09:34:07 +08:00
chenxudong 38f365c2f0 增加系统管理员权限校验 2025-01-07 09:28:51 +08:00
chenxudong a7ef78a56e reformate code 2025-01-07 09:12:09 +08:00
chenxudong 75443f2d78 Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-06 17:26:32 +08:00
chenxudong 22b4500278 增加项目发布状态查询的接口 2025-01-06 17:26:23 +08:00
s2042968 39e8afee9c Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-06 17:12:58 +08:00
s2042968 25d0cee750 新建角色,更新角色,前后端连调修改 2025-01-06 17:12:49 +08:00
chenxudong 7ba8c10d34 导入相关功能调通简单场景。 2025-01-06 16:35:20 +08:00
s2042968 1d76327674 角色增加空树接口,删除改为物理删除 2025-01-06 15:28:21 +08:00
chenxudong 0e7a54ba50 上传文件时增加层级结构定义的校验。 2025-01-06 14:34:06 +08:00
chenxudong 71e99ed8e5 Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
# Conflicts:
#	electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
解决冲突
2025-01-06 14:25:52 +08:00
chenxudong 7d0dd012ac 解决已知问题 2025-01-06 14:24:25 +08:00
s2042968 dbbc7e8699 Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-06 13:34:56 +08:00
s2042968 b3c6845c9d 更改:本地上传文件并建立关系 2025-01-06 13:34:46 +08:00
chenxudong f0e17b0704 增加工程排序功能 2025-01-03 17:11:32 +08:00
s2042968 ebea20981b Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-03 15:38:38 +08:00
s2042968 62c0545c9a 本地上传文件并建立关系 2025-01-03 15:38:25 +08:00
chenxudong 80a187ed12 调通了数据库导出接口 2025-01-03 14:40:54 +08:00
chenxudong 52a51c8e1b 查询排序 2025-01-03 14:18:40 +08:00
chenxudong cf40b68ccd Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-03 10:30:34 +08:00
chenxudong de4f48507c 调通文件导出接口 2025-01-03 10:30:24 +08:00
s2042968 061516f82e 文件关系网状图,增加关系id和描述 2025-01-03 10:11:05 +08:00
s2042968 7151243618 Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-02 17:26:28 +08:00
s2042968 965222bea2 文件关系网状图 2025-01-02 17:26:16 +08:00
chenxudong dd13bf76e3 update fix 2025-01-02 16:21:26 +08:00
chenxudong eb973e59c0 Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop 2025-01-02 14:56:18 +08:00