fix(jg):1，新增设备使用单位名称填写错误；2，按照单位办理的使用登记设备查询条件修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -412,8 +412,8 @@
             and ui."RECORD" = #{jsonObject.record}
         </if>
         <if test="jsonObject.record == null">
-            and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE
-            v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
+            and not exists(SELECT 1 FROM tzs_jg_use_registration v, tzs_jg_use_registration_eq ve WHERE
+            v.sequence_nbr = ve.equip_transfer_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
             !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
         </if>
         ORDER BY ui.REC_DATE DESC
@@ -466,10 +466,9 @@
         WHERE
         ri."EQU_CATEGORY" = '2300'
         and ui."DATA_SOURCE" like 'jg%'
-        and NOT(ui."EQU_STATE" is not null )
-        and NOT(ri."USE_ORG_CODE" is not null )
         and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
-        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''">
+        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
+        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
         </if>
         <choose>

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

@@ -1624,7 +1624,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
         if (companyTypeStr.contains(CompanyTypeEnum.USE.getCode()) || companyTypeStr.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
             useInfo.setUseUnitCreditCode(companyInfoMap.get("creditCode").toString());
-            useInfo.setUseUnitName(companyInfoMap.get("companyTypeName").toString());
+            useInfo.setUseUnitName(companyInfoMap.get("companyName").toString());
         }
 
         if (isCopy) {