[清退] 添加经办人的判断

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -584,10 +584,18 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         enumList.add(StatusEnum.SEND_BACK_1215);
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),enumList);
         DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
-        deviceRepelDetail.setReceiveUserB(storageDeviceRepel.getUserBName());
-        deviceRepelDetail.setReceiveUserbId(storageDeviceRepel.getUserB());
-        deviceRepelDetail.setReceiveUserA(storageDeviceRepel.getUserAName());
-        deviceRepelDetail.setReceiveUseraId(storageDeviceRepel.getUserA());
+        if (storageDeviceRepel.getUserBName()!=null) {
+            deviceRepelDetail.setReceiveUserB(storageDeviceRepel.getUserBName());
+        }
+        if (storageDeviceRepel.getUserB()!=null) {
+            deviceRepelDetail.setReceiveUserbId(storageDeviceRepel.getUserB());
+        }
+        if (storageDeviceRepel.getUserAName()!=null) {
+            deviceRepelDetail.setReceiveUserA(storageDeviceRepel.getUserAName());
+        }
+        if (storageDeviceRepel.getUserA()!=null) {
+            deviceRepelDetail.setReceiveUseraId(storageDeviceRepel.getUserA());
+        }
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
         taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1220,storageDeviceRepel.getUserB());
     }