|
|
@@ -431,8 +431,13 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
|
|
|
for (Map<String, Object> tag : tagMapData) {
|
|
|
if (tag.get("employee_id").toString().equals(list.get(i).getEmployeeId().toString())
|
|
|
&& tag.get("contact_id").toString().equals(list.get(i).getContactId().toString()) ) {
|
|
|
- list.get(i).setTagNames(tag.get("tag_names").toString());
|
|
|
- list.get(i).setTagIds(tag.get("tag_ids").toString());
|
|
|
+ if(tag.get("tag_names") != null){
|
|
|
+ list.get(i).setTagNames(tag.get("tag_names").toString());
|
|
|
+ }
|
|
|
+
|
|
|
+ if(tag.get("tag_ids") != null){
|
|
|
+ list.get(i).setTagIds(tag.get("tag_ids").toString());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|