修改获取联系人接口

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

@@ -728,14 +728,15 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
                         .eq("id",contactsId)));
             }
         }else if(salesId!=null){
+            //要找销售订单对应的客户,然后再找客户对应的联系人
             SalesOrder salesOrder = salesOrderMapper.selectById(salesId);
-            if (salesOrder==null||salesOrder.getContactsId()==null){
+            if (salesOrder==null||salesOrder.getCustomId()==null){
                 mgs.setData(new ArrayList<Contacts>());
             }else {
-                Integer contactsId = salesOrder.getContactsId();
+                Integer contactsId = salesOrder.getCustomId();
                 mgs.setData(contactsMapper.selectList(new QueryWrapper<Contacts>()
                         .eq("company_id",user.getCompanyId())
-                        .eq("id",contactsId)));
+                        .eq("custom_id",contactsId)));
             }
 
         }

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

@@ -793,7 +793,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         dataList.add(titleList);//设置表头
 
         taskDto.setCompanyId(user.getCompanyId());
-        taskDto.setPageIndex((taskDto.getPageIndex()-1)*taskDto.getPageSize()).setPageSize(taskDto.getPageSize());
+        taskDto.setPageIndex(null).setPageSize(null);
         List<TasKVo> taskVoList =taskMapper.getPageListTask(taskDto);
         if (!taskVoList.isEmpty()){
             for (TasKVo tasKVo : taskVoList) {