Commit 01419081 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/master'

parents c2c0cfb7 539877b9
...@@ -204,6 +204,7 @@ ...@@ -204,6 +204,7 @@
a.delete_flag = '0' and a.IS_COMPLETE = '1' a.delete_flag = '0' and a.IS_COMPLETE = '1'
<include refid="employeeRegistrationPre_where"/> <include refid="employeeRegistrationPre_where"/>
</where> </where>
GROUP BY a.id
</select> </select>
......
...@@ -467,6 +467,7 @@ ...@@ -467,6 +467,7 @@
<where> <where>
1=1 and a.type_sub = '0' 1=1 and a.type_sub = '0'
<include refid="tDispatchInfoPre_where"/> <include refid="tDispatchInfoPre_where"/>
group by a.id
</where> </where>
</select> </select>
<select id="selectFundExportCount" resultType="java.lang.Long"> <select id="selectFundExportCount" resultType="java.lang.Long">
...@@ -478,6 +479,7 @@ ...@@ -478,6 +479,7 @@
1=1 and a.type_sub = '1' 1=1 and a.type_sub = '1'
and a.DELETE_FLAG = '0' and a.DELETE_FLAG = '0'
<include refid="tDispatchInfoPre_where"/> <include refid="tDispatchInfoPre_where"/>
group by a.id
</where> </where>
</select> </select>
......
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