|
@@ -503,6 +503,7 @@
|
|
<if test="companyType!=null and companyType!=''">
|
|
<if test="companyType!=null and companyType!=''">
|
|
and a.company_type=#{companyType}
|
|
and a.company_type=#{companyType}
|
|
</if>
|
|
</if>
|
|
|
|
+ and a.status != 8
|
|
</where>
|
|
</where>
|
|
GROUP BY a.id
|
|
GROUP BY a.id
|
|
<choose>
|
|
<choose>
|
|
@@ -636,6 +637,7 @@
|
|
<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
|
|
<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
|
|
AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
|
|
AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
|
|
</if>
|
|
</if>
|
|
|
|
+ and a.status != 8
|
|
</where>
|
|
</where>
|
|
</select>
|
|
</select>
|
|
|
|
|