| @@ -665,7 +665,7 @@ | |||||
| and cu.`final_tenant_id` = #{finalTenantId} | and cu.`final_tenant_id` = #{finalTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != phone "> | |||||
| <if test=" null != phone and '' != phone"> | |||||
| and cu.`phone` like concat('%', #{phone},'%') | and cu.`phone` like concat('%', #{phone},'%') | ||||
| </if> | </if> | ||||
| @@ -673,7 +673,7 @@ | |||||
| and cu.`birthdate` = #{birthdate} | and cu.`birthdate` = #{birthdate} | ||||
| </if> | </if> | ||||
| <if test=" null != education "> | |||||
| <if test=" null != education and '' != education"> | |||||
| and cu.`education` like concat('%', #{education},'%') | and cu.`education` like concat('%', #{education},'%') | ||||
| </if> | </if> | ||||
| @@ -681,11 +681,11 @@ | |||||
| and cu.`sex` = #{sex} | and cu.`sex` = #{sex} | ||||
| </if> | </if> | ||||
| <if test=" null != email "> | |||||
| <if test=" null != email and '' != email"> | |||||
| and cu.`email` like concat('%', #{email},'%') | and cu.`email` like concat('%', #{email},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != address "> | |||||
| <if test=" null != address and '' != address"> | |||||
| and cu.`address` like concat('%', #{address},'%') | and cu.`address` like concat('%', #{address},'%') | ||||
| </if> | </if> | ||||
| @@ -709,7 +709,7 @@ | |||||
| and cu.`act_record` = #{actRecord} | and cu.`act_record` = #{actRecord} | ||||
| </if> | </if> | ||||
| <if test=" null != name "> | |||||
| <if test=" null != name and '' != name"> | |||||
| and cu.`name` like concat('%', #{name},'%') | and cu.`name` like concat('%', #{name},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != startTime and null!=endTime"> | <if test=" null != startTime and null!=endTime"> | ||||
| @@ -741,7 +741,7 @@ | |||||
| and cu.`tenant_id` like concat('%,', #{tenantInfo.tenantId},',%') | and cu.`tenant_id` like concat('%,', #{tenantInfo.tenantId},',%') | ||||
| </if> | </if> | ||||
| <if test=" null != basicInfo.phone "> | |||||
| <if test=" null != basicInfo.phone and '' != basicInfo.phone"> | |||||
| and cu.`phone` like concat('%', #{basicInfo.phone},'%') | and cu.`phone` like concat('%', #{basicInfo.phone},'%') | ||||
| </if> | </if> | ||||
| @@ -749,7 +749,7 @@ | |||||
| and cu.`birthdate` = #{basicInfo.birthdate} | and cu.`birthdate` = #{basicInfo.birthdate} | ||||
| </if> | </if> | ||||
| <if test=" null != basicInfo.education "> | |||||
| <if test=" null != basicInfo.education and '' != basicInfo.education"> | |||||
| and cu.`education` like concat('%', #{basicInfo.education},'%') | and cu.`education` like concat('%', #{basicInfo.education},'%') | ||||
| </if> | </if> | ||||
| @@ -757,11 +757,11 @@ | |||||
| and cu.`sex` = #{basicInfo.sex} | and cu.`sex` = #{basicInfo.sex} | ||||
| </if> | </if> | ||||
| <if test=" null != basicInfo.email "> | |||||
| <if test=" null != basicInfo.email and '' != basicInfo.email"> | |||||
| and cu.`email` like concat('%', #{basicInfo.email},'%') | and cu.`email` like concat('%', #{basicInfo.email},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != basicInfo.address "> | |||||
| <if test=" null != basicInfo.address and '' != basicInfo.address"> | |||||
| and cu.`address` like concat('%', #{basicInfo.address},'%') | and cu.`address` like concat('%', #{basicInfo.address},'%') | ||||
| </if> | </if> | ||||
| @@ -785,7 +785,7 @@ | |||||
| and cu.`act_record` = #{basicInfo.actRecord} | and cu.`act_record` = #{basicInfo.actRecord} | ||||
| </if> | </if> | ||||
| <if test=" null != basicInfo.name "> | |||||
| <if test=" null != basicInfo.name and '' != basicInfo.name "> | |||||
| and cu.`name` like concat('%', #{basicInfo.name},'%') | and cu.`name` like concat('%', #{basicInfo.name},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != basicInfo.startTime and null != basicInfo.endTime"> | <if test=" null != basicInfo.startTime and null != basicInfo.endTime"> | ||||