Commit Graph

1687 Commits

Author SHA1 Message Date
wangliwen 81e13e7824 Merge branch 'master' into dev 2022-08-12 17:18:43 +08:00
wangliwen 7d4f3cdb57 增加置顶接口 2022-08-12 17:18:20 +08:00
dinggang e51668cc4d 排序修改 2022-08-12 16:58:35 +08:00
wangliwen 6e7c224109 sql 2022-08-12 16:29:48 +08:00
wangliwen ab11836c23 ... 2022-08-12 16:26:22 +08:00
wangliwen 2ccc878eda 增加能力置顶字段 2022-08-12 16:12:50 +08:00
wangliwen f45e3ea2f4 parallelStream 使用自定义 ForkJoinPool防止任务堆积 2022-08-12 14:11:34 +08:00
wangliwen 8980f61b1c 2022-08-12 10:41:11 +08:00
dinggang f6509b5e19 ... 2022-08-11 14:55:20 +08:00
dinggang 4aee184562 ... 2022-08-11 14:02:35 +08:00
zhangzhikang 6b98b44d48 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-11 09:27:35 +08:00
zhangzhikang e4ba0fcbea 会议室功能后端开发 2022-08-11 09:20:29 +08:00
lizhicheng a01ecfc0fb 融合服务接口优化 2022-08-10 19:43:17 +08:00
dinggang 65dc6fae91 ... 2022-08-10 14:02:19 +08:00
huangweixiong 201a092ed0 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  能力广场-应用资源列表查询
  编目更新
2022-08-10 11:56:10 +08:00
huangweixiong bbefe4fff1 增加网关注册接口 2022-08-10 11:55:54 +08:00
dinggang 0f493bb87c 能力广场-应用资源列表查询 2022-08-09 16:52:04 +08:00
dinggang 1dee7f1edc 编目更新 2022-08-09 10:02:53 +08:00
huangweixiong b071097e96 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段
2022-08-08 16:48:12 +08:00
huangweixiong 51fac0eb09 网关测试用接口 2022-08-08 16:45:46 +08:00
dinggang a94fce5066 管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段 2022-08-08 15:36:33 +08:00
huangweixiong 1e8c970c39 能力挂接注册网关 2022-08-08 15:17:03 +08:00
wangliwen f7af710466 npe 2022-08-08 14:47:15 +08:00
wangliwen 33c2b30a60 ... 2022-08-08 10:46:13 +08:00
wangliwen c1cd6de9e3 2022-08-08 09:58:47 +08:00
wangliwen 4d53ef4c99 TODO 异步优化 2022-08-08 09:43:57 +08:00
wangliwen 50696e2617 新赋予部门审批人权限用户分配审批去啊权重更大 2022-08-06 09:48:45 +08:00
dinggang e5da46fd4d sql更新 2022-08-05 17:34:53 +08:00
wangliwen b9a489beac Merge remote-tracking branch 'origin/dev' into dev 2022-08-05 17:14:49 +08:00
wangliwen 16df18cddf 异步处理 能力申请 2022-08-05 17:14:44 +08:00
yitonglei 20c73efac5 修改ResourceDao.xml的selectByAppArea,增加了条件 AND tda.attr_type = '应用领域' 2022-08-05 15:10:27 +08:00
wangliwen 1047569a77 。。。 2022-08-05 12:48:03 +08:00
wangliwen 36ad699d38 Merge remote-tracking branch 'origin/dev' into dev 2022-08-05 11:56:26 +08:00
wangliwen c065c04703 资源部门被删 2022-08-05 11:56:16 +08:00
dinggang 603d107b65 ... 2022-08-05 10:41:55 +08:00
wangliwen 0666081fdc Merge branch 'dev' 2022-08-05 10:25:20 +08:00
wangliwen 166fe05195 。。。 2022-08-05 10:25:00 +08:00
dinggang 8953cbd867 减少日志输出 2022-08-05 09:59:47 +08:00
wangliwen a1bbd95591 Merge remote-tracking branch 'origin/dev' into dev 2022-08-05 09:46:19 +08:00
wangliwen e4736d2ac4 部门审批人用户状态被停用时,流程不再分配给该用户 2022-08-05 09:46:09 +08:00
dinggang a0901114ec .. 2022-08-05 09:18:29 +08:00
wangliwen e33a7ede3b Merge branch 'dev' 2022-08-05 09:09:22 +08:00
wangliwen 5023c7f288 2022-08-05 09:09:14 +08:00
wangliwen 3d3cf6f6f1 Merge branch 'dev' 2022-08-04 17:41:00 +08:00
huangweixiong 086c9ff165 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  主动终止时 驳回置false
  getByApplyFlag增加backToFirst标识
  驳回重复通知
2022-08-04 17:24:49 +08:00
huangweixiong 082a6612ec 开启网关数据同步 2022-08-04 17:24:25 +08:00
wangliwen 832ec73593 Merge branch 'dev' 2022-08-04 11:21:07 +08:00
wangliwen f2c55b7718 主动终止时 驳回置false 2022-08-04 10:57:36 +08:00
wangliwen 2360250ef6 Merge branch 'dev' 2022-08-04 10:16:58 +08:00
wangliwen c728ff3960 getByApplyFlag增加backToFirst标识 2022-08-04 10:16:51 +08:00