Merge branch 'developlll' into develop-lin

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -879,6 +879,12 @@
         ${ex.selected}
         FROM settle_expense a
         ${ex.query}
+        <if test='adminWebsitIds != null and adminWebsitIds.size > 0' >
+            AND a.websit_id  in
+            <foreach collection="adminWebsitIds" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>
@@ -893,6 +899,12 @@
         <if test="workerId != null">
             AND (a.worker_name1 = #{workerId} OR a.worker_name2 = #{workerId})
         </if>
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>