修改线上BUG，所有客户列表查询所有客户

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -909,7 +909,7 @@ public class CrmController {
 //								.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like)
 //								.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like)
 //								.orderByDesc(CrmClientData::getCreateTime));
 //								.orderByDesc(CrmClientData::getCreateTime));
 
 
-				datas = crmClientDataMapper.getCrmClientData2(page,empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime,type,ifPhone,customerowner,unfollowedDays,followNumber,industry);
+				datas = crmClientDataMapper.getCrmClientData2(page,empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime,type,ifPhone,customerowner,unfollowedDays,followNumber,industry,keywordStr);
 
 
 			}
 			}
 
 

src/main/java/cn/timer/api/dao/crm/CrmClientDataMapper.java

@@ -67,7 +67,7 @@ public interface CrmClientDataMapper extends BaseMapper<CrmClientData> {
 										 @Param("endFollowTime") String endFollowTime,@Param("type") Integer type,
 										 @Param("endFollowTime") String endFollowTime,@Param("type") Integer type,
 										   @Param("ifPhone") String ifPhone,@Param("customerowner") String customerowner,
 										   @Param("ifPhone") String ifPhone,@Param("customerowner") String customerowner,
 										 @Param("unfollowedDays") Integer unfollowedDays, @Param("followNumber") Integer followNumber,
 										 @Param("unfollowedDays") Integer unfollowedDays, @Param("followNumber") Integer followNumber,
-										 @Param("industry") Integer industry);
+										 @Param("industry") Integer industry,@Param("keywordStr") String keywordStr);
 
 
 	List<CrmClientData> getCrmClientData3(@Param("empNum") Integer empNum, @Param("orgCode") Integer orgCode,
 	List<CrmClientData> getCrmClientData3(@Param("empNum") Integer empNum, @Param("orgCode") Integer orgCode,
 										   @Param("groupId") Integer groupId, @Param("status") Integer status,
 										   @Param("groupId") Integer groupId, @Param("status") Integer status,

src/main/resources/mapping/crm/CrmClientDataMapper.xml

@@ -52,7 +52,7 @@
 		GROUP BY ccd.belong_user
 		GROUP BY ccd.belong_user
 	</select>
 	</select>
 
 
-	<select id="getCrmClientData" resultType="CrmClientData">
+	<select id="getCrmClientData" resultType="cn.timer.api.bean.crm.CrmClientData">
 		SELECT *
 		SELECT *
 		FROM crm_client_data ccd
 		FROM crm_client_data ccd
 		WHERE ccd.org_code = #{orgCode}
 		WHERE ccd.org_code = #{orgCode}
@@ -94,7 +94,7 @@
 	</select>
 	</select>
 
 
 
 
-	<select id="getCrmClientData1" resultType="CrmClientData">
+	<select id="getCrmClientData1" resultType="cn.timer.api.bean.crm.CrmClientData">
 		SELECT ccd.*
 		SELECT ccd.*
 		FROM crm_client_data ccd
 		FROM crm_client_data ccd
 		WHERE ccd.org_code = #{orgCode}
 		WHERE ccd.org_code = #{orgCode}
@@ -141,7 +141,7 @@
 		ORDER BY ccd.create_time DESC
 		ORDER BY ccd.create_time DESC
 	</select>
 	</select>
 
 
-	<select id="getCrmClientData2" resultType="CrmClientData">
+	<select id="getCrmClientData2" resultType="cn.timer.api.bean.crm.CrmClientData">
 		SELECT *
 		SELECT *
 		FROM crm_client_data ccd
 		FROM crm_client_data ccd
 		WHERE ccd.org_code = #{orgCode}
 		WHERE ccd.org_code = #{orgCode}
@@ -161,7 +161,7 @@
 			AND ccd.client_status = #{status}
 			AND ccd.client_status = #{status}
 		</if>
 		</if>
 		<if test="keywordStr != null and keywordStr != ''">
 		<if test="keywordStr != null and keywordStr != ''">
-			AND ccd.belong_group IN (${keywordStr})
+			AND ccd.belong_group IN (#{keywordStr})
 		</if>
 		</if>
 		<if test="ifPhone != null and ifPhone != '' and  ifPhone == '1'">
 		<if test="ifPhone != null and ifPhone != '' and  ifPhone == '1'">
 			AND ccd.client_cellphone LIKE '%1'
 			AND ccd.client_cellphone LIKE '%1'
@@ -188,10 +188,10 @@
 			WHERE cid = ccd.id
 			WHERE cid = ccd.id
 			) >= #{followNumber}
 			) >= #{followNumber}
 		</if>
 		</if>
-		ORDER BY ccd.create_time DESC;
+		ORDER BY ccd.create_time DESC
 	</select>
 	</select>
 
 
-	<select id="getCrmClientData3" resultType="CrmClientData">
+	<select id="getCrmClientData3" resultType="cn.timer.api.bean.crm.CrmClientData">
 		SELECT *
 		SELECT *
 		FROM crm_client_data ccd
 		FROM crm_client_data ccd
 		WHERE ccd.belong_group = #{gid}
 		WHERE ccd.belong_group = #{gid}
@@ -235,12 +235,12 @@
 			WHERE cid = ccd.id
 			WHERE cid = ccd.id
 			) >= #{followNumber}
 			) >= #{followNumber}
 		</if>
 		</if>
-		ORDER BY ccd.create_time DESC;
+		ORDER BY ccd.create_time DESC
 	</select>
 	</select>
 
 
 
 
 
 
-	<select id="getCrmClientData4" resultType="CrmClientData">
+	<select id="getCrmClientData4" resultType="cn.timer.api.bean.crm.CrmClientData">
 		SELECT ccd.*
 		SELECT ccd.*
 		FROM crm_remind_rule crr
 		FROM crm_remind_rule crr
 		left join crm_client_data ccd on ccd.id=crr.crm_client_id
 		left join crm_client_data ccd on ccd.id=crr.crm_client_id
@@ -294,7 +294,7 @@
 		ORDER BY ccd.create_time DESC
 		ORDER BY ccd.create_time DESC
 	</select>
 	</select>
 
 
-	<select id="getCrmClientData5" resultType="CrmClientData">
+	<select id="getCrmClientData5" resultType="cn.timer.api.bean.crm.CrmClientData">
 		SELECT ccd.*
 		SELECT ccd.*
 		FROM crm_remind_rule crr
 		FROM crm_remind_rule crr
 		left join crm_client_data ccd on ccd.id=crr.crm_client_id
 		left join crm_client_data ccd on ccd.id=crr.crm_client_id
@@ -343,7 +343,7 @@
 		ORDER BY ccd.create_time DESC
 		ORDER BY ccd.create_time DESC
 	</select>
 	</select>
 
 
-	<select id="getCrmClientData6" resultType="CrmClientData">
+	<select id="getCrmClientData6" resultType="cn.timer.api.bean.crm.CrmClientData">
 		SELECT ccd.*
 		SELECT ccd.*
 		FROM crm_remind_rule crr
 		FROM crm_remind_rule crr
 		left join crm_client_data ccd on ccd.id=crr.crm_client_id
 		left join crm_client_data ccd on ccd.id=crr.crm_client_id
@@ -398,7 +398,7 @@
 	</select>
 	</select>
 
 
 
 
-	<select id="getToBeFollowedList" resultType="CrmClientData">
+	<select id="getToBeFollowedList" resultType="cn.timer.api.bean.crm.CrmClientData">
 		SELECT ccd.*
 		SELECT ccd.*
 		FROM crm_remind_rule crr
 		FROM crm_remind_rule crr
 		left join crm_client_data ccd on ccd.id=crr.crm_client_id
 		left join crm_client_data ccd on ccd.id=crr.crm_client_id