2 Commits aaa7bb7def ... 66c822fb30

Author SHA1 Message Date
  Guo1B0 66c822fb30 Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper 10 months ago
  Guo1B0 50b4d9503f 客户修改 10 months ago

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

@@ -310,7 +310,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
             Map<String, String> map = users.stream()
                     .collect(Collectors.toMap(User::getId,User::getName));
             for (Contacts contact : contacts) {
-                contact.setOwnerName(map.get(contact.getOwnerName()));
+                contact.setOwnerName(map.get(contact.getOwnerId()));
                 contact.setCreatorName(map.get(contact.getCreatorId()));
             }
         }

+ 1 - 1
fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/CustomMapper.xml

@@ -81,7 +81,7 @@
         <if test="email != null and email != '' ">
             and c.email LIKE CONCAT('%', #{email}, '%')
         </if>
-        <if test="companyPhone != null and companyPhone = '' ">
+        <if test="companyPhone != null and companyPhone != '' ">
             and c.company_phone = #{companyPhone}
         </if>
         <if test="customerLevelId != null ">