diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java
index b19484cf3..87faf6b06 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java
@@ -53,6 +53,11 @@ public class UpdateFollowTaskRequest {
         result.setCommunicationType(request.getCommunicationType());
         result.setDeadline(request.getDeadline());
         result.setCommunicationContent(request.getCommunicationContent());
+        if(request.getDeadline().getTime() > System.currentTimeMillis()){
+            result.setTaskStatus(FollowTaskStatusEnum.TODO.getCode());
+        }else{
+            result.setTaskStatus(FollowTaskStatusEnum.OVERDUE.getCode());
+        }
         return result;
     }
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
index e175ff2ad..bc1d7b94f 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
@@ -149,7 +149,7 @@ public class FollowTaskServiceImpl implements FollowTaskService {
     @Override
     public Integer updateFollowTask(UpdateFollowTaskRequest request, String userId) {
         HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId());
-        if(!FollowTaskStatusEnum.TODO.getCode().equals(followTask.getTaskStatus())){
+        if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.CANCELLED.getCode().equals(followTask.getTaskStatus())){
             throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE);
         }
         if(Objects.nonNull(request.getDeadline()) && request.getDeadline().getTime() < System.currentTimeMillis()){
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
index 67804c407..ce729a75f 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
@@ -111,6 +111,9 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
         List<String> removeLabels = new ArrayList<>(oldLabels);
         addLabels.removeAll(oldLabels);
         removeLabels.removeAll(newLabels);
+        if(CollectionUtils.isEmpty(addLabels) && CollectionUtils.isEmpty(removeLabels)){
+            return Boolean.TRUE;
+        }
         LineLogInfo lineLogInfo = new LineLogInfo(line.getPartnerId(), line.getId(), user.getUserId(),
                 user.getName(), OperateTypeEnum.ADD_TAGS,
                 WorkflowStageEnum.getWorkflowStageByCode(line.getWorkflowStage()),