fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -117,6 +117,12 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
             ) > 0) {
                 msg.setError("电话号码重复了");
                 return msg;
+            } if (customMapper.selectCount(new QueryWrapper<Custom>()
+                    .eq("company_phone", custom.getCompanyPhone())
+                    .ne("company_phone", custom1.getCompanyPhone())
+            ) > 0) {
+                msg.setError("电话号码重复了");
+                return msg;
             }
             ActionLog actionLog = new ActionLog();
             actionLog.setCode("custom");

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/BusinessOpportunityMapper.xml

@@ -45,7 +45,7 @@
         <if test="name != null and name != ''">
             and `name` LIKE CONCAT('%', #{name}, '%')
         </if>
-        <if test="inchargerId != null and inchargerId == '' ">
+        <if test="inchargerId != null and inchargerId != '' ">
             and incharger_id = #{inchargerId}
         </if>
         <if test="startTime != null and endTime != null ">
@@ -55,7 +55,7 @@
             and contacts_id in (select id from contacts where `name`LIKE CONCAT('%', #{contactsName}, '%'))
         </if>
         <if test="customerName != null and customerName != ''">
-            and customer_id in (select id from custom where `name`LIKE CONCAT('%', #{customerName}, '%'))
+            and customer_id in (select id from custom where `custom_name`LIKE CONCAT('%', #{customerName}, '%'))
         </if>
         <if test="stageId != null ">
             and stage_id = #{stageId}
@@ -75,7 +75,7 @@
         <if test="name != null and name != ''">
             and `name` LIKE CONCAT('%', #{name}, '%')
         </if>
-        <if test="inchargerId != null ">
+        <if test="inchargerId != null and inchargerId != ''">
             and incharger_id = #{inchargerId}
         </if>
         <if test="startTime != null and endTime != null ">