Merge branch 'dev' into pre-production

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -1541,17 +1541,15 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			one.ifPresent(aftersalesProcessorEntity -> surveyRecordEntity.setProcessorId(aftersalesProcessorEntity.getId()));
 			surveyRecordEntity.setAddDepartment(myCurrentWarehouse.getDepartmentName());
 			surveyRecordEntity.setProcessingResults(surveyRecordEntity.getContent());
-			surveyRecordEntity.setProcessorId(user.getUserId());
-			surveyRecordEntity.setProcessorName(user.getNickName());
 		} else {
 			log.info("客服回复！！！{}", user.getUserName());
-			surveyRecordEntity.setProcessorId(user.getUserId());
-			surveyRecordEntity.setProcessorName(user.getNickName());
 			R<String> deptName = sysClient.getDeptName(Long.valueOf(user.getDeptId()));
 			surveyRecordEntity.setAddDepartment(deptName.getData());
 			surveyRecordEntity.setProcessingResults(surveyRecordEntity.getContent());
 		}
 		//添加回复信息
+		surveyRecordEntity.setProcessorId(user.getUserId());
+		surveyRecordEntity.setProcessorName(user.getNickName());
 		surveyRecordEntity.setDifference("1");
 		surveyRecordEntity.setTypesOf("1");
 		surveyRecordEntity.setAddPeople(user.getUserName());