Commit 64b208a7 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/develop' into develop

parents 7536152e 77697a95
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
AND a.EMP_CODE = #{tEmployeeProject.empCode} AND a.EMP_CODE = #{tEmployeeProject.empCode}
</if> </if>
<if test="tEmployeeProject.empNatrue != null and tEmployeeProject.empNatrue.trim() != ''"> <if test="tEmployeeProject.empNatrue != null and tEmployeeProject.empNatrue.trim() != ''">
AND a.EMP_NATRUE = #{tEmployeeProject.empNatrue} AND a.EMP_NATRUE in (${tEmployeeProject.empNatrue})
</if> </if>
<if test="tEmployeeProject.empName != null and tEmployeeProject.empName.trim() != ''"> <if test="tEmployeeProject.empName != null and tEmployeeProject.empName.trim() != ''">
AND a.EMP_NAME = #{tEmployeeProject.empName} AND a.EMP_NAME = #{tEmployeeProject.empName}
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
AND a.EMP_CODE = #{tEmployeeProject.empCode} AND a.EMP_CODE = #{tEmployeeProject.empCode}
</if> </if>
<if test="tEmployeeProject.empNatrue != null and tEmployeeProject.empNatrue.trim() != ''"> <if test="tEmployeeProject.empNatrue != null and tEmployeeProject.empNatrue.trim() != ''">
AND a.EMP_NATRUE = #{tEmployeeProject.empNatrue} AND a.EMP_NATRUE in (${tEmployeeProject.empNatrue})
</if> </if>
<if test="tEmployeeProject.empName != null and tEmployeeProject.empName.trim() != ''"> <if test="tEmployeeProject.empName != null and tEmployeeProject.empName.trim() != ''">
AND a.EMP_NAME = #{tEmployeeProject.empName} AND a.EMP_NAME = #{tEmployeeProject.empName}
......
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