Merge remote-tracking branch 'origin/master'

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

@@ -213,6 +213,18 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
         Integer companyId = user.getCompanyId();
         if (contacts == null || contacts.getId() == null) {
             msg.setError("关键信息为空");
+            return msg;
+        }
+        LambdaQueryWrapper<Contacts> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ne(Contacts::getId,contacts.getId()).eq(Contacts::getCompanyId,companyId);
+        List<Contacts> list = contactsMapper.selectList(queryWrapper);
+        if (!list.isEmpty()){
+            for (Contacts c : list) {
+                if (StringUtils.isNotEmpty(c.getPhone())&&StringUtils.isNotEmpty(contacts.getPhone())&&c.getPhone().equals(contacts.getPhone())){
+                    msg.setError("联系人电话存在重复,请修改");
+                    return msg;
+                }
+            }
         }
         contactsMapper.updateById(contacts);
 

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

@@ -425,7 +425,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                     String modelName = modelNameList.get(i);
                     XSSFCell cell = row.getCell(i);
                     if(modelName.equals("executorId")){
-                        if(!StringUtils.isEmpty(cell.getStringCellValue())){
+                        if((cell != null) && !StringUtils.isEmpty(cell.getStringCellValue())){
                             List<String> executorNames = new ArrayList<>();
                             String stringCellValue = cell.getStringCellValue();
                             // 定义正则表达式，匹配中文字符、英文字符、数字