fix(jg):三环认领数据导致打证有问题处理

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

@@ -627,8 +627,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     public void exportUseRegistrationCertificate(JgUseRegistrationManage manage, HttpServletResponse response, String printType) {
         Map<String, Object> exportParamsMap = new HashMap<>();
         // 查询使用登记详情
-
-        List<JSONObject> deviceList = this.queryEquByCertificateSeq(manage.getSequenceNbr());
+        List<JSONObject> deviceList = this.queryEquByCertificate(manage);
         if (ValidationUtil.isEmpty(manage) || ValidationUtil.isEmpty(deviceList)) {
             throw new BadRequest("使用登记证导出失败,请稍后重试!");
         }
@@ -711,6 +710,16 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         }
     }
 
+    /**
+     * 查询本单位下设备，过滤三环数据
+     * @param manage
+     * @return
+     */
+    private List<JSONObject> queryEquByCertificate(JgUseRegistrationManage manage) {
+        return queryEquByCertificateSeq(manage.getSequenceNbr()).stream()
+                .filter(s -> Objects.equals(s.get("USE_UNIT_CREDIT_CODE"), manage.getUseUnitCreditCode()))
+                .collect(Collectors.toList());
+    }
 
     private UseFlagParamDto buildUseFlagParamDto(List<JSONObject> deviceList, JgUseRegistrationManage manage, Map<String, Object> exportParamsMap) {
         UseFlagParamDto useFlagParamDto = new UseFlagParamDto();

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

@@ -437,7 +437,7 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp
             if (isOneSelf) {
                 if (CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType())) {
                     useInfo.setUseUnitName(company.getCompanyName().split("_")[1]);
-                    useInfo.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
+                    useInfo.setUseUnitCreditCode(company.getCompanyCode().split("_")[0]);
                 } else {
                     useInfo.setUseUnitName(company.getCompanyName());
                     useInfo.setUseUnitCreditCode(company.getCompanyCode());