Merge remote-tracking branch 'origin/master'

vue/src/views/companyService/company/edit.vue

@@ -603,12 +603,16 @@ export default defineComponent(
         }
         normalBtnLoading.value = true
         normalFirmByCompanyName(formState.dataModel.companyName).then((result) => {
-          message.info('匹配完毕');
-          Object.keys(result).forEach(key => {
-            if (result[key] != null) {
-              formState.dataModel[key] = result[key];
-            }
-          })
+          if (result == null) {
+            message.info('未查找到企业信息，请检查名称是否正确');
+          } else {
+            message.info('匹配完毕');
+            Object.keys(result).forEach(key => {
+              if (result[key] != null) {
+                formState.dataModel[key] = result[key];
+              }
+            })
+          }
         }).finally(() => {
           normalBtnLoading.value = false
         })