Merge branch 'zs_saas_0324_oa' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/resources/config/mybatis/FinancialExpenditureMapper.xml

@@ -265,10 +265,10 @@
     <select id="queryEmployByDeptId" resultType="java.lang.Integer">
         SELECT user_id FROM oa_pro.sys_user
         <where>
-            <if test="deptIds != null">
+            <if test="deptId != null">
                 AND dept_id = #{deptId}
             </if>
-            <if test="deptIds != null">
+            <if test="deptIds != null and deptIds != ''">
                 AND JSON_CONTAINS(dept_ids, #{deptIds})
             </if>
         </where>