问题反馈对接oa以及一堆bug

src/main/resources/mapper/ZtStoryUserMapper.xml

@@ -70,7 +70,32 @@
     </resultMap>
     <select id="pageList" resultType="com.sa.zentao.dao.ZtStoryUserDTO">
 
-            SELECT * from zt_story_user s WHERE 1=1
+            SELECT s.*,pt.name productName from zt_story_user s LEFT JOIN zt_product pt on s.product = pt.id WHERE 1=1
+
+            <if test="qo.productIds != null and qo.productIds.size() > 0">
+                    and s.product in
+                    <foreach collection="qo.productIds" item="id" index="index"
+                             open="(" close=")" separator=",">
+                            #{id}
+                    </foreach>
+
+            </if>
+
+            <if test="qo.startDate !=null">
+                    and  s.openedDate   <![CDATA[>=]]>    #{qo.startDate}
+            </if>
+            <if test="qo.endDate !=null">
+                    and  s.openedDate    <![CDATA[<=]]>  #{qo.endDate}
+            </if>
+
+
+
+            <if test="qo.productName != null and qo.productName != '' ">
+                    and pt.name   like concat('%', #{qo.productName}, '%')
+            </if>
+
+
+
 
             <if test="qo.searchVal == 'ALL' ">