fix

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

@@ -410,18 +410,35 @@
     <include refid="Base_Column_List" />
     from tab_haoban_wx_enterprise
     where status_flag = 1
-    	<if test="keyword != null and keyword != ''">
-    	    and corp_name like CONCAT('%',#{keyword},'%')
-    	</if>
     	<if test="gicContactFlag != null">
     		and contact_flag = #{gicContactFlag,jdbcType=INTEGER}
     	</if>
-	    <if test="enterpriseIds != null and enterpriseIds.size() > 0">
-	    	and wx_enterprise_id IN 
-		    <foreach collection="enterpriseIds" item="id" index="index" open="(" close=")" separator=",">
-		      #{id,jdbcType=VARCHAR}
-		    </foreach>
-	    </if>
+    	<if test="version != null and verion = 2">
+    		<if test="keyword != null and keyword != '' and enterpriseIds != null and enterpriseIds.size() > 0">
+    	    	and (corp_name like CONCAT('%',#{keyword},'%')
+    	    	or wx_enterprise_id IN 
+			    <foreach collection="enterpriseIds" item="id" index="index" open="(" close=")" separator=",">
+			      #{id,jdbcType=VARCHAR}
+			    </foreach>
+			    )
+	    	</if>
+		    <if test="keyword != null and keyword != '' and (enterpriseIds == null or enterpriseIds.size() > 0)">
+		    	and (corp_name like CONCAT('%',#{keyword},'%')
+		    </if>
+    	</if>
+    	
+    	<if test="version == null or verion = ''">
+    		<if test="keyword != null and keyword != ''">
+    	    and corp_name like CONCAT('%',#{keyword},'%')
+	    	</if>
+		    <if test="enterpriseIds != null and enterpriseIds.size() > 0">
+		    	and wx_enterprise_id IN 
+			    <foreach collection="enterpriseIds" item="id" index="index" open="(" close=")" separator=",">
+			      #{id,jdbcType=VARCHAR}
+			    </foreach>
+		    </if>
+    	</if>
+    	
   </select>
   <select id="listBycorpId" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select