|
|
@@ -437,6 +437,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
* 研发上传附件
|
|
|
*/
|
|
|
@Override
|
|
|
+ @DSTransactional
|
|
|
public void research(WorkOrderDto dto) {
|
|
|
WorkOrder workOrder = this.getById(dto.getId());
|
|
|
Assert.notEmpty(workOrder, "查询不到工单信息！");
|
|
|
@@ -451,7 +452,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
ObsFileUtil.editFile(dto.getFileList(), dto.getId());
|
|
|
|
|
|
//发消息
|
|
|
- if (workOrder.getResearchStatus() == 0 && dto.getResearchStatus() == 1) {
|
|
|
+ if (ObjectUtil.isNotEmpty(workOrder.getResearchStatus()) && workOrder.getResearchStatus() == 0 && dto.getResearchStatus() == 1) {
|
|
|
if ("1".equals(workOrder.getIsCustomized())) {
|
|
|
//定制工单 推送消息给工单配置的负责人
|
|
|
DynamicDataSourceContextHolder.push(SourceConstant.BASE);
|
yzc