Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java

@@ -1009,12 +1009,15 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
     private void updateUseRegistrationManage(JgChangeRegistrationTransferEq device, JgChangeRegistrationTransfer transfer, JgRegistrationHistory historyData, String useRegistrationCode, boolean isUpdateRegistrationCode) {
         JSONObject historyJson = JSON.parseObject(historyData.getChangeData());
+        JSONObject deviceInfo = JSON.parseObject(device.getDeviceInfo());
         List<JgUseRegistrationManage> registrationList = useRegistrationManageService.lambdaQuery()
                 .in(BaseEntity::getSequenceNbr,
                         ((List<?>) historyJson.get("registrationList")).stream()
                                 .map(obj -> ((JSONObject) obj).getString("sequenceNbr"))
                                 .collect(Collectors.toList())
-                ).list();
+                )
+                .eq(JgUseRegistrationManage::getUseRegistrationCode,deviceInfo.getString("USE_ORG_CODE"))
+                .list();
 
         // 区外移装更新是否报废字段为1，区内移装不变
         if (isUpdateRegistrationCode) {