Merge branch 'master_118' into 'developer'

非空判断

See merge request !891

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -442,10 +442,13 @@
     
      <select id="listByStoreIds" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO">
      	<include refid="leftJoinStaffSQL"/>
-        where a.status_flag=1 and b.status_flag=1  and a.store_id in
-        <foreach collection="storeIds" index="index" item="item" open="(" separator="," close=")">
-              #{item}
-        </foreach>
+        where a.status_flag=1 and b.status_flag=1  
+        <if test="null != storeIds">
+        	and a.store_id in
+	        <foreach collection="storeIds" index="index" item="item" open="(" separator="," close=")">
+	              #{item}
+	        </foreach>
+        </if>
         <if test="null != wxEnterpriseId">
         	and a.wx_enterprise_id = #{wxEnterpriseId}
         </if>