Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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/JgChangeRegistrationUnitServiceImpl.java

@@ -947,7 +947,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                             //修改ES中使用单位信息和使用单位代码
                             Map<String, Map<String, Object>> resultMap = new HashMap<>();
                             Map<String, Object> map1 = new HashMap<>();
-                            map1.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
+                            String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
+                            map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
                             map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
                             map1.put("REC_DATE", new Date());// 更新时间，设备筛选时排在前面 bug-21476
                             resultMap.put(equipId, map1);