分页查询返回联系人电话,批量删除修改

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

@@ -296,7 +296,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         }
         List<Task> taskList = taskMapper.selectList(new QueryWrapper<Task>().in("id", taskIds));
         if (!taskList.isEmpty()){
-            List<Task> collect = taskList.stream().filter(task ->task.getStatus()!=0&& task.getStatus() != 2).collect(Collectors.toList());
+            List<Task> collect = taskList.stream().filter(task ->task.getStatus()!=null&&task.getStatus()!=0&&task.getStatus()!=2).collect(Collectors.toList());
             if (collect.size()>0){
                 msg.setError("存在任务未完成,不能删除");
                 return msg;

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

@@ -88,7 +88,7 @@
         <result column="order_name" property="orderName"/>
         <result column="clue_name" property="clueName"/>
         <result column="contacts_name" property="contactsName"/>
-        <result column="phone" property="contactsPhone"/>
+        <result column="contacts_phone" property="contactsPhone"/>
     </resultMap>
 
     <select id="getPageListTask" resultMap="TaskVoMap">
@@ -97,7 +97,7 @@
                business_opportunity.name businessName,
               `sales_order`.order_name ,
                clue.clue_name,
-               contacts.name contacts_name ,contacts.phone
+               contacts.name contacts_name ,contacts.phone contacts_phone
         from task
             left join  custom on task.custom_id=custom.id
             left join  business_opportunity on task.business_opportunity_id=business_opportunity.id