diff --git a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
index f3ab62c4..a27326f0 100644
--- a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
@@ -35,7 +35,7 @@
         from t_dx_record_invoice t
         where t.invoice_type in ('01','03','08','14','31') and t.auth_status = '4' <!--and rzh_yesorno='1'-->
         and t.gf_tax_no = #{gfsh}
-        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+        and t.comp_code = #{companyCode}
         <if test="skssq != null and skssq != '' and skssq != 'null' ">
             and t.rzh_belong_date = #{skssq}
         </if>
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
index f35edc17..7d8cdfd2 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
@@ -376,6 +376,11 @@ public class ExtFpzhcxController extends AbstractController {
         data.put("dbName", getUserInfo().getDbName());
 
         data.put("gfsh", pramsMap.get("gfsh").toString());
+
+        if (StringUtils.isBlank((String) pramsMap.get("companyCode"))){
+            return ResponseEntity.ok(R.error("组织编码不能为空"));
+        }
+        data.put("companyCode",pramsMap.get("companyCode"));
         if (pramsMap.get("yczt") != null && !"".equals(pramsMap.get("yczt")) && !"99".equals(pramsMap.get("yczt"))) {
             data.put("yczt", pramsMap.get("yczt"));
         }