Commit b873682c authored by hezhen's avatar hezhen

Merge branch 'master-tiande' into dev-tiande

parents 6c42ef52 148f5958
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
or t.company_id = #{startCompanyId}) or t.company_id = #{startCompanyId})
</if> </if>
<if test="corporationId != null and corporationId > 0 "> <if test="corporationId != null and corporationId > 0 ">
and (t.corporation_id = #{corporationId} or t.start_corporation_id = #{corporationId} and (t.corporation_id = #{corporationId} or t.start_corporation_id = #{corporationId} )
</if> </if>
<if test="dataCompanyIds != null and dataCompanyIds.size > 0"> <if test="dataCompanyIds != null and dataCompanyIds.size > 0">
and (t.company_id in and (t.company_id in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment