wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,164 Commits 6 Branches 12 Tags 25 MiB
Commit Graph

1101 Commits

Author SHA1 Message Date
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 5023c7f288 屮 2022-08-05 09:09:14 +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 f2c55b7718 主动终止时 驳回置false 2022-08-04 10:57:36 +08:00
wangliwen c728ff3960 getByApplyFlag增加backToFirst标识 2022-08-04 10:16:51 +08:00
wangliwen f47682c7f3 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-03 18:40:04 +08:00
wangliwen 0753dcf27c 驳回重复通知 2022-08-03 18:39:18 +08:00
huangweixiong 359e49f7db 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-03 18:06:50 +08:00
wangliwen ec2b030a30 ... 2022-08-03 18:05:20 +08:00
huangweixiong ebfbe769a6 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:
  资源上架异常
  。。。
  pageWithAttrs补充返回approveStatus字段值
  。。。
  配置文件新增默认审批人id
  管理系统-用户管理-列表查询新增根据用户姓名模糊查询
  被驳回 消息通知
  被驳回时发送消息通知
 2022-08-03 18:05:05 +08:00
huangweixiong 8e69ca0526 网关总数同步 2022-08-03 18:04:47 +08:00
wangliwen c27816d13a 资源上架异常 2022-08-03 17:49:04 +08:00
wangliwen 6159b3b1ba 。。。 2022-08-03 16:49:52 +08:00
wangliwen 654ef21298 pageWithAttrs补充返回approveStatus字段值 2022-08-03 16:39:33 +08:00
wangliwen d59ebd507b Merge remote-tracking branch 'origin/dev' into dev 2022-08-03 16:28:18 +08:00
wangliwen 8b40e077d1 。。。 2022-08-03 16:27:54 +08:00
dinggang d945bad3a5 配置文件新增默认审批人id 2022-08-03 16:26:04 +08:00
dinggang d0c8b4ae5f 管理系统-用户管理-列表查询新增根据用户姓名模糊查询 2022-08-03 15:22:03 +08:00
wangliwen 46ccea4556 被驳回 消息通知 2022-08-03 15:09:49 +08:00
wangliwen 527266a9b5 Merge remote-tracking branch 'origin/dev' into dev 2022-08-03 14:41:08 +08:00
wangliwen 1ec9b2db5c 被驳回时发送消息通知 2022-08-03 14:40:42 +08:00
huangweixiong 259f1b757a 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:
  ..
  1、修改获取基础设施-视频资源的相关sql操作的表为cache表
  发起者终止流程
  存在欺诈行为？
  npe
  删除所有运行中的流程接口
  ...
  npe
  屮
  ..
  。。。
  ？？？
  用户主动终止流程
  1.编目更新 2.工作台部门待办列表查询增加申请人姓名bugfix
  通过实例id 终止流程
  1、修改因为合并代码出现的基础设施-视频资源，点击左侧树报错的问题，原因是sql语句去组织cache表中查询了
  Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
  ..
  超级管理员挂载能力时 无部门id问题

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/gateway/service/MonitorServiceV2.java
 2022-08-03 14:27:30 +08:00
huangweixiong 04db7c6dc5 网关重启数据失效适配 2022-08-03 14:24:35 +08:00
dinggang af5e237b3d .. 2022-08-03 11:04:53 +08:00
yitonglei 975d6654ce 1、修改获取基础设施-视频资源的相关sql操作的表为cache表 2022-08-02 18:13:25 +08:00
wangliwen d0df922c62 发起者终止流程 2022-08-02 16:58:48 +08:00
wangliwen a04745eaab 存在欺诈行为？ 2022-08-02 15:55:58 +08:00
wangliwen d170f9c177 npe 2022-08-02 15:40:46 +08:00
wangliwen 95989cc59c 删除所有运行中的流程接口 2022-08-02 15:32:08 +08:00
wangliwen d96f797813 ... 2022-08-02 15:08:01 +08:00
wangliwen cbd91df644 npe 2022-08-02 14:49:03 +08:00
wangliwen bbf677b513 屮 2022-08-02 14:08:57 +08:00