|
@@ -45,6 +45,7 @@
|
|
left join sys_custom sc on sc.id = tbc.custom_id
|
|
left join sys_custom sc on sc.id = tbc.custom_id
|
|
left join sys_user su ON tfcfe.create_id = su.id
|
|
left join sys_user su ON tfcfe.create_id = su.id
|
|
<where> 1 = 1
|
|
<where> 1 = 1
|
|
|
|
+ and tbs.status!='CANCEL'
|
|
and art.ASSIGNEE_ = cast(#{userId} as char)
|
|
and art.ASSIGNEE_ = cast(#{userId} as char)
|
|
<if test="flowTaskTypeEnum != null and flowTaskTypeEnum != '' and flowTaskTypeEnum == 'DRAFT'">
|
|
<if test="flowTaskTypeEnum != null and flowTaskTypeEnum != '' and flowTaskTypeEnum == 'DRAFT'">
|
|
and tffa.status = #{flowTaskTypeEnum}
|
|
and tffa.status = #{flowTaskTypeEnum}
|
|
@@ -109,6 +110,7 @@
|
|
left join sys_custom sc on sc.id = tbc.custom_id
|
|
left join sys_custom sc on sc.id = tbc.custom_id
|
|
left join sys_user su ON tfcfe.create_id = su.id
|
|
left join sys_user su ON tfcfe.create_id = su.id
|
|
<where> 1 = 1
|
|
<where> 1 = 1
|
|
|
|
+ and tbs.status!='CANCEL'
|
|
and art.ASSIGNEE_ is null
|
|
and art.ASSIGNEE_ is null
|
|
and ari.USER_ID_ = cast(#{userId} as char)
|
|
and ari.USER_ID_ = cast(#{userId} as char)
|
|
and ari.TYPE_ = 'candidate'
|
|
and ari.TYPE_ = 'candidate'
|