使用单位变更导出

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

@@ -733,15 +733,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             String equDefine = registerInfo.getEquDefine();//设备品种
             List<EquipmentCategory> categoryList0 = commonService.getEquipmentCategoryList(equList, null);
             List<EquipmentCategory> categoryList1 = commonService.getEquipmentCategoryList(equCategory, null);
-            List<EquipmentCategory> categoryList2 = commonService.getEquipmentCategoryList(equDefine, null);
             if (org.apache.commons.collections.CollectionUtils.isNotEmpty(categoryList1)) {
                 exportParamsMap.put("equList", categoryList0.get(0).getName());
             }
             if (org.apache.commons.collections.CollectionUtils.isNotEmpty(categoryList1)) {
                 exportParamsMap.put("equCategory", categoryList1.get(0).getName());
             }
-            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(categoryList2)) {
-                exportParamsMap.put("equDefine", categoryList2.get(0).getName());
+            if(!ValidationUtil.isEmpty(equDefine)) {
+                List<EquipmentCategory> categoryList2 = commonService.getEquipmentCategoryList(equDefine, null);
+                if (org.apache.commons.collections.CollectionUtils.isNotEmpty(categoryList2)) {
+                    exportParamsMap.put("equDefine", categoryList2.get(0).getName());
+                }
             }
             //设备代码
             exportParamsMap.put("equCode", registerInfo.getEquCode());