[退役、报废] bug修改

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java

@@ -173,9 +173,9 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
                 deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
                 deviceDecommissioningDetail.setSendUserbId(decommissioningOrderOutData.getSendUserbId());
                 deviceDecommissioningDetail.setSenderUserB(decommissioningOrderOutData.getSenderUserB());
-                deviceDecommissioningDetail.setReceiveUnit(decommissioningOrderOutData.getReceiveUnit());
-                deviceDecommissioningDetail.setReceiveUnitId(decommissioningOrderOutData.getReceiveUnitId());
             }
+            deviceDecommissioningDetail.setReceiveUnit(decommissioningOrderOutData.getReceiveUnit());
+            deviceDecommissioningDetail.setReceiveUnitId(decommissioningOrderOutData.getReceiveUnitId());
             deviceDecommissioningDetail.setLeftSignatureId(decommissioningOrderOutData.getLeftSignatureId());
             deviceDecommissioningDetail.setApplyNumber(decommissioningOrderOutData.getApplyNumber());
             deviceDecommissioningDetail.setReplayNumber(decommissioningOrderOutData.getReplayNumber());
@@ -279,6 +279,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
             taskBto = taskService.moveToSpecial(taskBto, StatusEnum.DECOMMISSIONING_1251, orderOutData.getSendUserbId());
             deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
         }
+        deviceDecommissioningDetail.setReceiveUnit(orderOutData.getReceiveUnit());
+        deviceDecommissioningDetail.setReceiveUnitId(orderOutData.getReceiveUnitId());
         deviceDecommissioningDetail.setReceiveTime(new Date());
         deviceDecommissioningDetail.setApplyNumber(orderOutData.getApplyNumber());
         deviceDecommissioningDetail.setReplayNumber(orderOutData.getReplayNumber());

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java

@@ -107,10 +107,9 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             scrap.setScrapStatus(taskBto.getBillStatus());
             scrap.setSenderUserB(scrapOrderOutData.getSenderUserB());
             scrap.setSendUserbId(scrapOrderOutData.getSendUserbId());
-            scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit());
-            scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId());
         }
-
+        scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit());
+        scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId());
         scrap.setDeviceIds(StringUtils.ListToString(scrapOrderOutData.getDevIds()));
         scrap.setOutboundFile(FilesUtil.stringFileToList(scrapOrderOutData.getOutboundFileList()));
         scrap.setOutboundFile(FilesUtil.stringFileToList(scrapOrderOutData.getOutboundFileList()));
@@ -165,6 +164,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
             scrap.setScrapStatus(taskBto.getBillStatus());
         }
+        scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit());
+        scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId());
         scrap.setLeftSignatureId(scrapOrderOutData.getLeftSignatureId());
         scrap.setSendUserbId(scrapOrderOutData.getSendUserbId());
         scrap.setSenderUserB(scrapOrderOutData.getSenderUserB());
@@ -265,6 +266,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             taskBto= taskService.moveToSpecial(taskBto, StatusEnum.SCRAP_2224, user.getUserId());
             scrap.setScrapStatus(taskBto.getBillStatus());
         }
+        scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit());
+        scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId());
         scrap.setApplyNumber(scrapOrderOutData.getApplyNumber());
         scrap.setReplayNumber(scrapOrderOutData.getReplayNumber());
         scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));

dev-user/src/main/java/com/tykj/dev/device/user/util/AuthenticationUtils.java

@@ -54,7 +54,7 @@ public class AuthenticationUtils {
         if (authentication != null) {
             Object userObject = authentication.getPrincipal();
             if (ANONYMOUS_USER_STRING.equals(userObject)) {
-                log.info("当前无登录用户");
+//                log.info("当前无登录用户");
             }
 
             if (userObject instanceof SecurityUser) {
@@ -64,7 +64,7 @@ public class AuthenticationUtils {
                 return findUserNameToSecurity(((org.springframework.security.core.userdetails.User) userObject).getUsername());
             }
         } else {
-            log.info("当前无登录用户");
+//            log.info("当前无登录用户");
             return null;
         }