|
@@ -127,7 +127,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
- if (contactsMapper.selectCount(new QueryWrapper<Contacts>()
|
|
|
+ if (custom.getCustomName() != null && contactsMapper.selectCount(new QueryWrapper<Contacts>()
|
|
|
.eq("contacts_name", custom.getContactsName())
|
|
|
) == 0) {
|
|
|
msg.setError("此联系人不存在");
|
|
@@ -144,10 +144,12 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
actionLog.setItemId(custom.getId());
|
|
|
actionLogMapper.insert(actionLog);
|
|
|
customMapper.insert(custom);
|
|
|
- Contacts contacts = contactsMapper.selectOne(new QueryWrapper<Contacts>().eq("name", custom.getCustomName()).eq("phone", custom.getTelPhone()));
|
|
|
- if (contacts != null){
|
|
|
- contacts.setCustomId(custom.getId());
|
|
|
- contactsMapper.update(contacts,new UpdateWrapper<Contacts>().eq("id",contacts.getId()));
|
|
|
+ if (custom.getCustomName() != null && custom.getCustomName()!="" &&custom.getTelPhone() !="" &&custom.getTelPhone()!=null){
|
|
|
+ Contacts contacts = contactsMapper.selectOne(new QueryWrapper<Contacts>().eq("name", custom.getCustomName()).eq("phone", custom.getTelPhone()));
|
|
|
+ if (contacts != null){
|
|
|
+ contacts.setCustomId(custom.getId());
|
|
|
+ contactsMapper.update(contacts,new UpdateWrapper<Contacts>().eq("id",contacts.getId()));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
msg.setMsg("操作成功");
|