Merge remote-tracking branch 'origin/dev_v1.0.1' into dev_v1.0.1

sop-business/src/main/resources/mapper/TBDingApplyMapper.xml

@@ -116,6 +116,7 @@
             </choose>
         </if>
             and tffa.status in ('START','DRAFT','AUDITING','REJECT','CANCEL')
+            and tbs.status = 'PUBLISH'
         </where>
     </sql>
 
@@ -194,7 +195,8 @@
             ss.id = tbuas.supplier_id
             left join ACT_HI_TASKINST aht on aht.PROC_INST_ID_ = tffa.flow_id
         <where> 1 = 1 and tfcf.type = 'DING_EXCEPTION_FLOW'
-          and tffa.status in ('AUDITING','REJECT','FINISH')
+            and tffa.status in ('AUDITING','REJECT','FINISH')
+            and tbs.status = 'PUBLISH'
             <!--and aht.ASSIGNEE_ = #{dpr.requestUserId}-->
             <if test="serviceId != null and serviceId != ''">
                 and tbs.id = #{serviceId}