|
@@ -943,7 +943,7 @@
|
|
AND FIND_IN_SET(t.organ_id_,#{organId})
|
|
AND FIND_IN_SET(t.organ_id_,#{organId})
|
|
</if>
|
|
</if>
|
|
<if test="organId != null and includeFlowOrgan!=null and includeFlowOrgan">
|
|
<if test="organId != null and includeFlowOrgan!=null and includeFlowOrgan">
|
|
- (CONCAT(',',t.organ_id_,',',IFNULL(t.flow_organ_range_,''),',') REGEXP CONCAT(',(',replace(#{organId},',','|'),'),'))
|
|
|
|
|
|
+ AND (CONCAT(',',t.organ_id_,',',IFNULL(t.flow_organ_range_,''),',') REGEXP CONCAT(',(',replace(#{organId},',','|'),'),'))
|
|
</if>
|
|
</if>
|
|
<if test="subjectIds != null">
|
|
<if test="subjectIds != null">
|
|
AND INTE_ARRAY(t.subject_id_,#{subjectIds})
|
|
AND INTE_ARRAY(t.subject_id_,#{subjectIds})
|