|
@@ -174,9 +174,9 @@
|
|
|
<if test="company != null and company.id != null and company.id != ''">
|
|
|
AND a.company_id = #{company.id}
|
|
|
</if>
|
|
|
- <!--<if test="office != null and office.id != null and office.id != ''">
|
|
|
+ <if test="office != null and office.id != null and office.id != ''">
|
|
|
AND a.office_id = #{office.id}
|
|
|
- </if>-->
|
|
|
+ </if>
|
|
|
<if test="officeIdList!=null and officeIdList.size!=0">
|
|
|
and a.office_id in
|
|
|
<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
|